r2755 - packages/trunk/wormux/debian/patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-05-28 21:44:46 +0000 (Mon, 28 May 2007)
New Revision: 2755

Modified:
   packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch
Log:
minor thing, remove the extra colon in the debug version of MSG_DEBUG, too

Modified: packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch
===================================================================
--- packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	2007-05-28 21:19:42 UTC (rev 2754)
+++ packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	2007-05-28 21:44:46 UTC (rev 2755)
@@ -1,6 +1,6 @@
 diff -Nur wormux-0.7.9/src/game/game_loop.cpp wormux-0.7.9.new/src/game/game_loop.cpp
 --- wormux-0.7.9/src/game/game_loop.cpp	2007-01-28 14:03:47.000000000 +0000
-+++ wormux-0.7.9.new/src/game/game_loop.cpp	2007-05-28 21:13:41.000000000 +0000
++++ wormux-0.7.9.new/src/game/game_loop.cpp	2007-05-28 21:36:15.000000000 +0000
 @@ -628,7 +628,7 @@
    {
      if (!character->IsImmobile() && !character->IsGhost())
@@ -20,8 +20,8 @@
      }
    }
 diff -Nur wormux-0.7.9/src/menu/credits_menu.cpp wormux-0.7.9.new/src/menu/credits_menu.cpp
---- wormux-0.7.9/src/menu/credits_menu.cpp	2007-05-28 21:11:19.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/credits_menu.cpp	2007-05-28 21:11:21.000000000 +0000
+--- wormux-0.7.9/src/menu/credits_menu.cpp	2007-01-28 14:03:47.000000000 +0000
++++ wormux-0.7.9.new/src/menu/credits_menu.cpp	2007-05-28 21:36:15.000000000 +0000
 @@ -111,7 +111,7 @@
      return;
    }
@@ -32,8 +32,8 @@
    for(uint i = 0; i < (sizeof teams / sizeof* teams); ++i)
    {
 diff -Nur wormux-0.7.9/src/menu/menu.cpp wormux-0.7.9.new/src/menu/menu.cpp
---- wormux-0.7.9/src/menu/menu.cpp	2007-05-28 21:11:19.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/menu.cpp	2007-05-28 21:11:21.000000000 +0000
+--- wormux-0.7.9/src/menu/menu.cpp	2007-01-28 14:03:47.000000000 +0000
++++ wormux-0.7.9.new/src/menu/menu.cpp	2007-05-28 21:36:15.000000000 +0000
 @@ -26,7 +26,7 @@
  #include "../tool/resource_manager.h"
  #include "../sound/jukebox.h"
@@ -44,8 +44,8 @@
  {
    close_menu = false ;
 diff -Nur wormux-0.7.9/src/menu/menu.h wormux-0.7.9.new/src/menu/menu.h
---- wormux-0.7.9/src/menu/menu.h	2007-05-28 21:11:19.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/menu.h	2007-05-28 21:11:21.000000000 +0000
+--- wormux-0.7.9/src/menu/menu.h	2007-01-28 14:03:47.000000000 +0000
++++ wormux-0.7.9.new/src/menu/menu.h	2007-05-28 21:36:15.000000000 +0000
 @@ -52,7 +52,7 @@
     WidgetList widgets;
     const t_action actions;
@@ -56,11 +56,14 @@
  
     void Run ();
 diff -Nur wormux-0.7.9/src/tool/debug.h wormux-0.7.9.new/src/tool/debug.h
---- wormux-0.7.9/src/tool/debug.h	2007-05-28 21:11:19.000000000 +0000
-+++ wormux-0.7.9.new/src/tool/debug.h	2007-05-28 21:11:21.000000000 +0000
-@@ -35,7 +35,7 @@
+--- wormux-0.7.9/src/tool/debug.h	2007-01-28 14:03:48.000000000 +0000
++++ wormux-0.7.9.new/src/tool/debug.h	2007-05-28 21:36:36.000000000 +0000
+@@ -33,9 +33,9 @@
+  */
+ #ifdef DEBUG
  #  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) \
- 	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS);
+-	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS);
++	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS)
  #else
 -#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...)
 +#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) do {} while (0)
@@ -68,8 +71,8 @@
  
  void PrintDebug (const char *filename, const char *function, unsigned long line,
 diff -Nur wormux-0.7.9/src/tool/resource_manager.cpp wormux-0.7.9.new/src/tool/resource_manager.cpp
---- wormux-0.7.9/src/tool/resource_manager.cpp	2007-05-28 21:11:19.000000000 +0000
-+++ wormux-0.7.9.new/src/tool/resource_manager.cpp	2007-05-28 21:11:21.000000000 +0000
+--- wormux-0.7.9/src/tool/resource_manager.cpp	2007-01-28 14:03:48.000000000 +0000
++++ wormux-0.7.9.new/src/tool/resource_manager.cpp	2007-05-28 21:36:15.000000000 +0000
 @@ -64,7 +64,7 @@
      Error("ResourceManager: can't find color resource \""+resource_name+"\" in profile "+profile->filename);