drop some unnecessary inlines

apparently somebody compiles with msvc?

diff --git a/cpu/debug.h b/cpu/debug.h
index 5aaa60e..63728ad 100644 (file)
--- a/cpu/debug.h
+++ b/cpu/debug.h
@@ -26,6 +26,6 @@ int pdb_net_connect(const char *host, const char *port);
 
 #else
 
-static inline int pdb_net_connect(const char *host, const char *port) {return 0;}
+static __inline int pdb_net_connect(const char *host, const char *port) {return 0;}
 
 #endif

diff --git a/cpu/sh2/compiler.c b/cpu/sh2/compiler.c
index 3a2b708..4403378 100644 (file)
--- a/cpu/sh2/compiler.c
+++ b/cpu/sh2/compiler.c
@@ -1017,7 +1017,7 @@ static void rcache_unlock_all(void)
     reg_temp[i].flags &= ~HRF_LOCKED;
 }
 
-static inline u32 rcache_used_hreg_mask(void)
+static u32 rcache_used_hreg_mask(void)
 {
   u32 mask = 0;
   int i;

diff --git a/cpu/sh2/mame/sh2.c b/cpu/sh2/mame/sh2.c
index 81203e7..2fb964b 100644 (file)
--- a/cpu/sh2/mame/sh2.c
+++ b/cpu/sh2/mame/sh2.c
@@ -108,6 +108,7 @@
 //#include "debugger.h"\r
 //#include "sh2.h"\r
 //#include "sh2comn.h"\r
+#undef INLINE\r
 #define INLINE static\r
 \r
 //CPU_DISASSEMBLE( sh2 );\r

diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index 174d469..636ebc6 100644 (file)
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -21,7 +21,7 @@ typedef unsigned char  UINT8;
 
 // this nasty conversion is needed for drc-expecting memhandlers
 #define MAKE_READFUNC(name, cname) \
-static inline unsigned int name(SH2 *sh2, unsigned int a) \
+static __inline unsigned int name(SH2 *sh2, unsigned int a) \
 { \
        unsigned int ret; \
        sh2->sr |= sh2->icount << 12; \
@@ -32,7 +32,7 @@ static inline unsigned int name(SH2 *sh2, unsigned int a) \
 }
 
 #define MAKE_WRITEFUNC(name, cname) \
-static inline void name(SH2 *sh2, unsigned int a, unsigned int d) \
+static __inline void name(SH2 *sh2, unsigned int a, unsigned int d) \
 { \
        sh2->sr |= sh2->icount << 12; \
        cname(a, d, sh2); \

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 49695b1..e945354 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -88,7 +88,7 @@ void sh2_unpack(SH2 *sh2, const unsigned char *buff);
 int  sh2_execute_drc(SH2 *sh2c, int cycles);\r
 int  sh2_execute_interpreter(SH2 *sh2c, int cycles);\r
 \r
-static inline int sh2_execute(SH2 *sh2, int cycles, int use_drc)\r
+static __inline int sh2_execute(SH2 *sh2, int cycles, int use_drc)\r
 {\r
   int ret;\r
 \r

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 51817c0..b20ebf3 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -366,7 +366,7 @@ static void p32x_run_events(unsigned int until)
       oldest, event_time_next);
 }
 
-static inline void run_sh2(SH2 *sh2, int m68k_cycles)
+static void run_sh2(SH2 *sh2, int m68k_cycles)
 {
   int cycles, done;
 

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index aad8406..27a66cd 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -49,7 +49,7 @@ static void SekSyncM68k(void)
   pprof_end(m68k);
 }
 
-static inline void SekRunM68k(int cyc)
+static __inline void SekRunM68k(int cyc)
 {
   Pico.t.m68c_aim += cyc;
   cyc = Pico.t.m68c_aim - Pico.t.m68c_cnt;