r12743 - in packages/trunk/invaders/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-10-31 13:09:33 +0000 (Mon, 31 Oct 2011)
New Revision: 12743

Added:
   packages/trunk/invaders/debian/patches/02-static-inline.patch
Modified:
   packages/trunk/invaders/debian/changelog
   packages/trunk/invaders/debian/patches/series
Log:
02-static-inline.patch: Replace "extern inline" with "static inline" in
io.h to allow for non-optimized builds.

Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog	2011-10-31 13:05:06 UTC (rev 12742)
+++ packages/trunk/invaders/debian/changelog	2011-10-31 13:09:33 UTC (rev 12743)
@@ -4,6 +4,8 @@
     patches: 01-misspelling-loose.patch and 01-uint8-char.patch.
   * Rename 02-gcc-ldflags.patch to 02-build-flags.patch, clean up CFLAGS
     and LDFLAGS a bit (we don't need -m32 twice) and replace -Werror with -W.
+  * 02-static-inline.patch: Replace "extern inline" with "static inline" in
+    io.h to allow for non-optimized builds.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 31 Oct 2011 13:10:20 +0100
 

Added: packages/trunk/invaders/debian/patches/02-static-inline.patch
===================================================================
--- packages/trunk/invaders/debian/patches/02-static-inline.patch	                        (rev 0)
+++ packages/trunk/invaders/debian/patches/02-static-inline.patch	2011-10-31 13:09:33 UTC (rev 12743)
@@ -0,0 +1,24 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Replace "extern inline" with "static inline" in io.h
+ to allow for non-optimized builds.
+
+--- invaders-1.0.0.orig/io.h
++++ invaders-1.0.0/io.h
+@@ -50,7 +50,7 @@
+  * Talk about misusing macros..
+  */
+ #define __OUT1(s,x) \
+-extern inline void out##s(unsigned x value, unsigned short port) {
++static inline void out##s(unsigned x value, unsigned short port) {
+ 
+ #define __OUT2(s,s1,s2) \
+ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
+@@ -60,7 +60,7 @@ __OUT1(s,x) __OUT2(s,s1,"w") : : "a" (va
+ __OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \
+ 
+ #define __IN1(s) \
+-extern inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
++static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
+ 
+ #define __IN2(s,s1,s2) \
+ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"

Modified: packages/trunk/invaders/debian/patches/series
===================================================================
--- packages/trunk/invaders/debian/patches/series	2011-10-31 13:05:06 UTC (rev 12742)
+++ packages/trunk/invaders/debian/patches/series	2011-10-31 13:09:33 UTC (rev 12743)
@@ -1,4 +1,5 @@
 01-misspelling-loose.patch
 01-uint8-char.patch
 02-build-flags.patch
+02-static-inline.patch
 03-reboot-on-esc.patch