Fix inline usage.

8 files changed, 129 insertions, 2 deletions

diff --git a/games/mirrormagic-sdl/distinfo b/games/mirrormagic-sdl/distinfo
index 6d1c2c02f81..62fc88b9a6a 100644
--- a/games/mirrormagic-sdl/distinfo
+++ b/games/mirrormagic-sdl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/04/03 16:57:06 dillo Exp $
+$NetBSD: distinfo,v 1.5 2012/08/10 18:04:53 joerg Exp $
 
 SHA1 (mirrormagic-2.0.2.tar.gz) = bce7fbf163d5177f59ba4f516b06a3ebb7cc3927
 RMD160 (mirrormagic-2.0.2.tar.gz) = 57de928f2b37575886ddb5cbafcababf9de765dc
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = 130a36ed3aea3f445dbccc0b6b45b7aa198bca12
 SHA1 (patch-ab) = abc9e8b8ed66225b50a398e287d94dfa1b728365
 SHA1 (patch-ac) = 2dd983a8f2a82f80226b902af28f5c29011e42e3
 SHA1 (patch-ad) = ebda01ff3f6dde6f56073e6ab8848d96110e17dd
+SHA1 (patch-src_libgame_misc.h) = a226378ea6dc7f4a16f8e65ae42df4ff04ccc1fb
+SHA1 (patch-src_libgame_sdl.h) = ce296d857d83f729a06b4e98bc33de218ff637ce
+SHA1 (patch-src_libgame_system.h) = a2129a503f3ea0eb49fb0721356cb6477684c03b
diff --git a/games/mirrormagic-sdl/patches/patch-src_libgame_misc.h b/games/mirrormagic-sdl/patches/patch-src_libgame_misc.h
new file mode 100644
index 00000000000..62591681a0b
--- /dev/null
+++ b/games/mirrormagic-sdl/patches/patch-src_libgame_misc.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgame_misc.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/misc.h.orig	2012-08-10 12:06:04.000000000 +0000
++++ src/libgame/misc.h
+@@ -137,8 +137,8 @@ void dumpLevelDirInfo(struct LevelDirInf
+ void sortLevelDirInfo(struct LevelDirInfo **,
+ 		      int (*compare_function)(const void *, const void *));
+ 
+-inline void swap_numbers(int *, int *);
+-inline void swap_number_pairs(int *, int *, int *, int *);
++void swap_numbers(int *, int *);
++void swap_number_pairs(int *, int *, int *, int *);
+ 
+ char *getUserDataDir(void);
+ char *getSetupDir(void);
diff --git a/games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h b/games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h
new file mode 100644
index 00000000000..2924279ed4c
--- /dev/null
+++ b/games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_libgame_sdl.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/sdl.h.orig	2012-08-10 12:21:02.000000000 +0000
++++ src/libgame/sdl.h
+@@ -314,20 +314,20 @@ struct XY
+ 
+ /* SDL function definitions */
+ 
+-inline void SDLInitVideoDisplay(void);
+-inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
+-inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
+-inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
+-inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
+-inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
+-inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
+-inline Pixel SDLGetPixel(Bitmap *, int, int);
++void SDLInitVideoDisplay(void);
++void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
++boolean SDLSetVideoMode(DrawBuffer **, boolean);
++void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
++void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
++void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
++void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
++Pixel SDLGetPixel(Bitmap *, int, int);
+ 
+ Bitmap *SDLLoadImage(char *);
+ 
+-inline void SDLOpenAudio(void);
+-inline void SDLCloseAudio(void);
++void SDLOpenAudio(void);
++void SDLCloseAudio(void);
+ 
+-inline void SDLNextEvent(Event *);
++void SDLNextEvent(Event *);
+ 
+ #endif /* SDL_H */
diff --git a/games/mirrormagic-sdl/patches/patch-src_libgame_system.h b/games/mirrormagic-sdl/patches/patch-src_libgame_system.h
new file mode 100644
index 00000000000..935e2f159c6
--- /dev/null
+++ b/games/mirrormagic-sdl/patches/patch-src_libgame_system.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_libgame_system.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/system.h.orig	2002-03-19 02:42:52.000000000 +0000
++++ src/libgame/system.h
+@@ -278,6 +278,8 @@ void InitGfxDoor1Info(int, int, int, int
+ void InitGfxDoor2Info(int, int, int, int);
+ void InitGfxScrollbufferInfo(int, int);
+ 
++#define inline
++
+ inline void InitVideoDisplay(void);
+ inline void CloseVideoDisplay(void);
+ inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
+@@ -315,4 +317,6 @@ inline void NextEvent(Event *event);
+ inline Key GetEventKey(KeyEvent *, boolean);
+ inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
+ 
++#undef inline
++
+ #endif /* SYSTEM_H */
diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo
index f0a124e789c..57a685470c7 100644
--- a/games/mirrormagic/distinfo
+++ b/games/mirrormagic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/04/03 16:57:06 dillo Exp $
+$NetBSD: distinfo,v 1.8 2012/08/10 18:04:53 joerg Exp $
 
 SHA1 (mirrormagic-2.0.2.tar.gz) = bce7fbf163d5177f59ba4f516b06a3ebb7cc3927
 RMD160 (mirrormagic-2.0.2.tar.gz) = 57de928f2b37575886ddb5cbafcababf9de765dc
@@ -6,3 +6,6 @@ Size (mirrormagic-2.0.2.tar.gz) = 1168098 bytes
 SHA1 (patch-aa) = ec4613d70482da6f240fefe57f6c61f745d01125
 SHA1 (patch-ab) = abc9e8b8ed66225b50a398e287d94dfa1b728365
 SHA1 (patch-ad) = ebda01ff3f6dde6f56073e6ab8848d96110e17dd
+SHA1 (patch-src_libgame_misc.h) = a226378ea6dc7f4a16f8e65ae42df4ff04ccc1fb
+SHA1 (patch-src_libgame_system.h) = a2129a503f3ea0eb49fb0721356cb6477684c03b
+SHA1 (patch-src_libgame_x11.h) = 2ad4a60d4b7d9e83d55832f323714dce80bd9c42
diff --git a/games/mirrormagic/patches/patch-src_libgame_misc.h b/games/mirrormagic/patches/patch-src_libgame_misc.h
new file mode 100644
index 00000000000..62591681a0b
--- /dev/null
+++ b/games/mirrormagic/patches/patch-src_libgame_misc.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgame_misc.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/misc.h.orig	2012-08-10 12:06:04.000000000 +0000
++++ src/libgame/misc.h
+@@ -137,8 +137,8 @@ void dumpLevelDirInfo(struct LevelDirInf
+ void sortLevelDirInfo(struct LevelDirInfo **,
+ 		      int (*compare_function)(const void *, const void *));
+ 
+-inline void swap_numbers(int *, int *);
+-inline void swap_number_pairs(int *, int *, int *, int *);
++void swap_numbers(int *, int *);
++void swap_number_pairs(int *, int *, int *, int *);
+ 
+ char *getUserDataDir(void);
+ char *getSetupDir(void);
diff --git a/games/mirrormagic/patches/patch-src_libgame_system.h b/games/mirrormagic/patches/patch-src_libgame_system.h
new file mode 100644
index 00000000000..935e2f159c6
--- /dev/null
+++ b/games/mirrormagic/patches/patch-src_libgame_system.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_libgame_system.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/system.h.orig	2002-03-19 02:42:52.000000000 +0000
++++ src/libgame/system.h
+@@ -278,6 +278,8 @@ void InitGfxDoor1Info(int, int, int, int
+ void InitGfxDoor2Info(int, int, int, int);
+ void InitGfxScrollbufferInfo(int, int);
+ 
++#define inline
++
+ inline void InitVideoDisplay(void);
+ inline void CloseVideoDisplay(void);
+ inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
+@@ -315,4 +317,6 @@ inline void NextEvent(Event *event);
+ inline Key GetEventKey(KeyEvent *, boolean);
+ inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
+ 
++#undef inline
++
+ #endif /* SYSTEM_H */
diff --git a/games/mirrormagic/patches/patch-src_libgame_x11.h b/games/mirrormagic/patches/patch-src_libgame_x11.h
new file mode 100644
index 00000000000..fbf47e7c4e9
--- /dev/null
+++ b/games/mirrormagic/patches/patch-src_libgame_x11.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgame_x11.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
+
+--- src/libgame/x11.h.orig	2012-08-10 12:06:45.000000000 +0000
++++ src/libgame/x11.h
+@@ -286,8 +286,8 @@ struct XY
+ 
+ /* X11 function definitions */
+ 
+-inline void X11InitVideoDisplay(void);
+-inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
++void X11InitVideoDisplay(void);
++void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
+ Bitmap *X11LoadImage(char *);
+ 
+ #endif /* X11_H */