Fix inline usage.

8 files changed, 104 insertions, 2 deletions

diff --git a/emulators/generator-cbiere/distinfo b/emulators/generator-cbiere/distinfo
index 767859a26ac..6f2c37b85a6 100644
--- a/emulators/generator-cbiere/distinfo
+++ b/emulators/generator-cbiere/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/09/08 07:42:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/12/20 21:59:21 joerg Exp $
 
 SHA1 (generator-0.35-cbiere-r4.tar.bz2) = 09d61950f128497af339d46ffc6c224eafe78206
 RMD160 (generator-0.35-cbiere-r4.tar.bz2) = 27d8fd2fb741bbbbd13956845c939ec4a0798b04
 Size (generator-0.35-cbiere-r4.tar.bz2) = 435289 bytes
+SHA1 (patch-main_event.c) = c9abbf1f80772844ba08701f6fe1adc07af139ae
+SHA1 (patch-main_vdp.c) = f905128b025d793f5a26c94ae80533211aef2105
+SHA1 (patch-ym2612_support.h) = 581fe7fc7cf7fddce2dbea20e1fb9e560e919fac
diff --git a/emulators/generator-cbiere/patches/patch-main_event.c b/emulators/generator-cbiere/patches/patch-main_event.c
new file mode 100644
index 00000000000..0c7723acf83
--- /dev/null
+++ b/emulators/generator-cbiere/patches/patch-main_event.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-main_event.c,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- main/event.c.orig	2005-09-02 02:43:05.000000000 +0000
++++ main/event.c
+@@ -15,7 +15,7 @@
+ 
+ /* time for next event - update vdp_event - return when to call again */
+ 
+-inline void event_nextevent(void)
++static inline void event_nextevent(void)
+ {
+   /* call this when it *is* time for the next event as dictated by vdp_event,
+      so we switch on it and update vdp_event at the same time */
diff --git a/emulators/generator-cbiere/patches/patch-main_vdp.c b/emulators/generator-cbiere/patches/patch-main_vdp.c
new file mode 100644
index 00000000000..5bcae2b8b33
--- /dev/null
+++ b/emulators/generator-cbiere/patches/patch-main_vdp.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-main_vdp.c,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- main/vdp.c.orig	2005-09-02 02:47:47.000000000 +0000
++++ main/vdp.c
+@@ -87,7 +87,7 @@ void vdp_describe(void);
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+                       uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
+      vdp_event_endline); */
+ }
+ 
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset)
+ {
+   int y, x;
diff --git a/emulators/generator-cbiere/patches/patch-ym2612_support.h b/emulators/generator-cbiere/patches/patch-ym2612_support.h
new file mode 100644
index 00000000000..6eda70041bf
--- /dev/null
+++ b/emulators/generator-cbiere/patches/patch-ym2612_support.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ym2612_support.h,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- ym2612/support.h.orig	2005-08-27 09:12:29.000000000 +0000
++++ ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE static inline
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
diff --git a/emulators/generator/distinfo b/emulators/generator/distinfo
index 6dbf8913c54..4eb24160129 100644
--- a/emulators/generator/distinfo
+++ b/emulators/generator/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2009/10/29 17:58:50 joerg Exp $
+$NetBSD: distinfo,v 1.10 2012/12/20 21:59:20 joerg Exp $
 
 SHA1 (generator-0.35.tar.gz) = a61138579efd97028d3a69c54c3c6fcd0a3d74ab
 RMD160 (generator-0.35.tar.gz) = 6b448018b8ed0fd9755ddb850f48892304d12e78
@@ -10,3 +10,6 @@ SHA1 (patch-ae) = 4e689421fe66aa7f635191e9f0100cd98daf8a76
 SHA1 (patch-af) = ef1c72b6da1ae93209a13b6836d5a85f66ffa51c
 SHA1 (patch-ag) = 2837e5f931326b1ac4fb7b045c05a81d809693e4
 SHA1 (patch-ah) = 4e76b9cd2fd377dee83273bafe930bec77b9bef1
+SHA1 (patch-main_event.c) = 6016e3c5de1b0c027f637962f740238f0a1e4573
+SHA1 (patch-main_vdp.c) = 0d5ef7815c8c4e03b2df8692af31739c9a1f773c
+SHA1 (patch-ym2612_support.h) = 1bf38d55f289881468cb2e7eb0fa02c7ec08dd1c
diff --git a/emulators/generator/patches/patch-main_event.c b/emulators/generator/patches/patch-main_event.c
new file mode 100644
index 00000000000..e7212d8dafc
--- /dev/null
+++ b/emulators/generator/patches/patch-main_event.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-main_event.c,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- main/event.c.orig	2012-12-20 19:12:33.000000000 +0000
++++ main/event.c
+@@ -16,7 +16,7 @@
+ 
+ /* time for next event - update vdp_event - return when to call again */
+ 
+-inline void event_nextevent(void)
++static inline void event_nextevent(void)
+ {
+   /* call this when it *is* time for the next event as dictated by vdp_event,
+      so we switch on it and update vdp_event at the same time */
diff --git a/emulators/generator/patches/patch-main_vdp.c b/emulators/generator/patches/patch-main_vdp.c
new file mode 100644
index 00000000000..70db58c1f02
--- /dev/null
+++ b/emulators/generator/patches/patch-main_vdp.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-main_vdp.c,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- main/vdp.c.orig	2012-12-20 19:12:50.000000000 +0000
++++ main/vdp.c
+@@ -90,7 +90,7 @@ void vdp_describe(void);
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+                       uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1705,7 +1705,7 @@ void vdp_endfield(void)
+      vdp_event_endline); */
+ }
+ 
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset)
+ {
+   int y, x;
diff --git a/emulators/generator/patches/patch-ym2612_support.h b/emulators/generator/patches/patch-ym2612_support.h
new file mode 100644
index 00000000000..4e1370182c4
--- /dev/null
+++ b/emulators/generator/patches/patch-ym2612_support.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ym2612_support.h,v 1.1 2012/12/20 21:59:21 joerg Exp $
+
+--- ym2612/support.h.orig	2012-12-20 19:09:12.000000000 +0000
++++ ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE static inline
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock) /* */