[mupen64plus-core] 224/310: Fix multiple definitions of main in same namespace

[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 67183cf0f24702cd5269bdde1e8109126dd0177a
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Jun 25 11:41:18 2013 +0200

    Fix multiple definitions of main in same namespace
---
 debian/changelog                   |  8 ++++++++
 debian/patches/multiple_main.patch | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ef4789..aac0096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus-core (2.0~rc3+3+5d46baa3dd76-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add multiple_main.patch, Fix multiple definitions of main in same
+      namespace
+
+ -- Sven Eckelmann <sven at narfation.org>  Tue, 25 Jun 2013 11:40:57 +0200
+
 mupen64plus-core (2.0~rc3+3+5d46baa3dd76-2) experimental; urgency=low
 
   * debian/rules:
diff --git a/debian/patches/multiple_main.patch b/debian/patches/multiple_main.patch
new file mode 100644
index 0000000..d348f99
--- /dev/null
+++ b/debian/patches/multiple_main.patch
@@ -0,0 +1,21 @@
+Description: Fix multiple definitions of main in same namespace
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/main/main.c b/src/main/main.c
+index a710bc1d5ad02bb73097da509ce709e533a3f74d..0929fe718fcc9d55d7657edacc689d2f8c324780 100644
+--- a/src/main/main.c
++++ b/src/main/main.c
+@@ -859,12 +859,3 @@ void main_stop(void)
+     }
+ #endif        
+ }
+-
+-/*********************************************************************************************************
+-* main function
+-*/
+-int main(int argc, char *argv[])
+-{
+-    return 1;
+-}
+-
diff --git a/debian/patches/series b/debian/patches/series
index ea4a049..808a129 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ country_code_bits.patch
 sdl2_keyrepeat.patch
 sdl2_joystick_events.patch
 sdl2_keysym.patch
+multiple_main.patch

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