r15924 - packages/trunk/desmume/debian/patches

[Evgeni Golov]

Author: evgeni
Date: 2016-11-12 10:13:29 +0000 (Sat, 12 Nov 2016)
New Revision: 15924

Modified:
   packages/trunk/desmume/debian/patches/gcc6_fixes.patch
Log:
add more gcc6 fixes


Modified: packages/trunk/desmume/debian/patches/gcc6_fixes.patch
===================================================================
--- packages/trunk/desmume/debian/patches/gcc6_fixes.patch	2016-11-12 09:55:56 UTC (rev 15923)
+++ packages/trunk/desmume/debian/patches/gcc6_fixes.patch	2016-11-12 10:13:29 UTC (rev 15924)
@@ -1,5 +1,5 @@
 From: zeromus
-Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517
+Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430
 Subject: fix GCC6 issues
 Bug: https://sourceforge.net/p/desmume/bugs/1570/
 Bug-Debian: http://bugs.debian.org/811691
@@ -41,3 +41,19 @@
          {
            if (event->jaxis.value > 0)
              key_code |= 1;
+Index: src/wifi.cpp
+===================================================================
+--- src/wifi.cpp	(revision 5429)
++++ src/wifi.cpp	(revision 5430)
+@@ -320,9 +320,9 @@
+ 
+ #if (WIFI_LOGGING_LEVEL >= 1)
+ 	#if WIFI_LOG_USE_LOGC
+-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__);
++		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
+ 	#else
+-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__);
++		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
+ 	#endif
+ #else
+ #define WIFI_LOG(level, ...) {}