[mupen64plus-core] 89/310: Don't define variable isGoldeneyeRom in each file

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 7fcab805291ce6eb379664bb95a45d78ef04fcff
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 12:02:59 2011 +0200

    Don't define variable isGoldeneyeRom in each file
---
 debian/changelog                        |  2 ++
 debian/patches/conflicting_symbol.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 02a2bb1..5705af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ mupen64plus-core (1.99.4-3) UNRELEASED; urgency=low
       .local/share/mupen64plus/ owned by root
     - Add info_configuration_failure.patch, Changed warning to info message when
       core can not open config
+    - Add conflicting_symbol.patch, Don't define variable isGoldeneyeRom in each
+      file
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 13 Jul 2011 08:38:54 +0200
 
diff --git a/debian/patches/conflicting_symbol.patch b/debian/patches/conflicting_symbol.patch
new file mode 100644
index 0000000..5828f00
--- /dev/null
+++ b/debian/patches/conflicting_symbol.patch
@@ -0,0 +1,31 @@
+Description: Don't define variable isGoldeneyeRom in each file
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/77a69a06ebfc
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/main/rom.c b/src/main/rom.c
+index 07df3f110f31e15ef2d9c45e9730a24b5100b9d5..9b1a65bc76bbaa3a204f4ee35299f39a8a031803 100644
+--- a/src/main/rom.c
++++ b/src/main/rom.c
+@@ -49,6 +49,8 @@ unsigned char* rom = NULL;
+ /* Global loaded rom size. */
+ int rom_size = 0;
+ 
++unsigned char isGoldeneyeRom = 0;
++
+ rom_header*       ROM_HEADER;
+ m64p_rom_settings ROM_SETTINGS;
+ 
+diff --git a/src/main/rom.h b/src/main/rom.h
+index 20ca967ca4e72f8f71145e381a94abca59107726..a16df417fc05a41478f6b72d567cb563bdab44a6 100644
+--- a/src/main/rom.h
++++ b/src/main/rom.h
+@@ -54,7 +54,7 @@ typedef struct _rom_header
+    unsigned int Boot_Code[1008];            /* 0x40 */
+ } rom_header;
+ 
+-unsigned char isGoldeneyeRom;
++extern unsigned char isGoldeneyeRom;
+ 
+ extern rom_header*       ROM_HEADER;
+ extern m64p_rom_settings ROM_SETTINGS;
diff --git a/debian/patches/series b/debian/patches/series
index 9ca2321..89263a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ rjump_globber.patch
 big_endian_conflict.patch
 privilege_segfault.patch
 info_configuration_failure.patch
+conflicting_symbol.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git