summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/beezer.cpp2
-rw-r--r--src/mame/audio/exidy.cpp2
-rw-r--r--src/mame/audio/micro3d.cpp6
-rw-r--r--src/mame/audio/segasnd.cpp8
-rw-r--r--src/mame/audio/tx1.cpp2
-rw-r--r--src/mame/audio/vboy.cpp4
-rw-r--r--src/mame/drivers/39in1.cpp2
-rw-r--r--src/mame/drivers/atarisy4.cpp2
-rw-r--r--src/mame/drivers/cdi.cpp2
-rw-r--r--src/mame/drivers/cxhumax.cpp6
-rw-r--r--src/mame/drivers/ddenlovr.cpp4
-rw-r--r--src/mame/drivers/dm7000.cpp2
-rw-r--r--src/mame/drivers/gba.cpp4
-rw-r--r--src/mame/drivers/gp32.cpp2
-rw-r--r--src/mame/drivers/multfish.cpp8
-rw-r--r--src/mame/drivers/namcoic.cpp6
-rw-r--r--src/mame/drivers/namcos23.cpp2
-rw-r--r--src/mame/drivers/photon2.cpp4
-rw-r--r--src/mame/drivers/subsino2.cpp2
-rw-r--r--src/mame/drivers/taitotz.cpp12
-rw-r--r--src/mame/drivers/viper.cpp8
-rw-r--r--src/mame/drivers/zaurus.cpp2
-rw-r--r--src/mame/etc/jrcrypt.cpp4
-rw-r--r--src/mame/includes/model2.h2
-rw-r--r--src/mame/machine/appldriv.cpp2
-rw-r--r--src/mame/machine/cdi070.cpp2
-rw-r--r--src/mame/machine/cdicdic.cpp10
-rw-r--r--src/mame/machine/cdislave.cpp2
-rw-r--r--src/mame/machine/docg3.cpp2
-rw-r--r--src/mame/machine/fddebug.cpp20
-rw-r--r--src/mame/machine/gaelco3d.cpp4
-rw-r--r--src/mame/machine/micro3d.cpp4
-rw-r--r--src/mame/machine/midwayic.cpp2
-rw-r--r--src/mame/machine/n64.cpp2
-rw-r--r--src/mame/machine/psxcd.cpp2
-rw-r--r--src/mame/machine/sgi.cpp2
-rw-r--r--src/mame/machine/smartmed.cpp4
-rw-r--r--src/mame/machine/tx1.cpp6
-rw-r--r--src/mame/video/amiga.cpp12
-rw-r--r--src/mame/video/amigaaga.cpp12
-rw-r--r--src/mame/video/gba.cpp14
-rw-r--r--src/mame/video/hng64.cpp2
-rw-r--r--src/mame/video/k053936.cpp2
-rw-r--r--src/mame/video/konamigx.cpp4
-rw-r--r--src/mame/video/mcd212.cpp6
-rw-r--r--src/mame/video/midzeus.cpp32
-rw-r--r--src/mame/video/midzeus2.cpp18
-rw-r--r--src/mame/video/model2.cpp10
-rw-r--r--src/mame/video/model3.cpp2
-rw-r--r--src/mame/video/namcofl.cpp4
-rw-r--r--src/mame/video/namconb1.cpp4
-rw-r--r--src/mame/video/namcos2.cpp2
-rw-r--r--src/mame/video/newport.cpp2
-rw-r--r--src/mame/video/rdpfiltr.inc34
-rw-r--r--src/mame/video/tatsumi.cpp2
-rw-r--r--src/mame/video/victory.cpp2
-rw-r--r--src/mame/video/vrender0.cpp4
-rw-r--r--src/mame/video/wgp.cpp2
58 files changed, 166 insertions, 166 deletions
diff --git a/src/mame/audio/beezer.cpp b/src/mame/audio/beezer.cpp
index f026b480f1b..3a295208073 100644
--- a/src/mame/audio/beezer.cpp
+++ b/src/mame/audio/beezer.cpp
@@ -192,7 +192,7 @@ void beezer_sound_device::device_reset()
*
*************************************/
// need to set int_flag properly here
-INLINE void sh6840_apply_clock(struct sh6840_timer_channel_beez *t, int clocks)
+static inline void sh6840_apply_clock(struct sh6840_timer_channel_beez *t, int clocks)
{
/* dual 8-bit case */
if (t->cr & 0x04)
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index 16de53a8dd3..c8bbaaf25ba 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -55,7 +55,7 @@ WRITE_LINE_MEMBER( exidy_sound_device::update_irq_state )
*
*************************************/
-INLINE void sh6840_apply_clock(struct sh6840_timer_channel *t, int clocks)
+static inline void sh6840_apply_clock(struct sh6840_timer_channel *t, int clocks)
{
/* dual 8-bit case */
if (t->cr & 0x04)
diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp
index 0a53160f017..4e7cea003e9 100644
--- a/src/mame/audio/micro3d.cpp
+++ b/src/mame/audio/micro3d.cpp
@@ -22,20 +22,20 @@
*************************************/
/* Borrowed from segasnd.c */
-INLINE void configure_filter(m3d_filter_state *state, double r, double c)
+static inline void configure_filter(m3d_filter_state *state, double r, double c)
{
state->capval = 0;
state->exponent = 1.0 - exp(-1.0 / (r * c * 2000000/8));
}
#if 0
-INLINE double step_rc_filter(m3d_filter_state *state, double input)
+static inline double step_rc_filter(m3d_filter_state *state, double input)
{
state->capval += (input - state->capval) * state->exponent;
return state->capval;
}
-INLINE double step_cr_filter(m3d_filter_state *state, double input)
+static inline double step_cr_filter(m3d_filter_state *state, double input)
{
double result = (input - state->capval);
state->capval += (input - state->capval) * state->exponent;
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index 72d58d8fa51..abc5df498d4 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -37,21 +37,21 @@
INLINE FUNCTIONS
***************************************************************************/
-INLINE void configure_filter(g80_filter_state *state, double r, double c)
+static inline void configure_filter(g80_filter_state *state, double r, double c)
{
state->capval = 0;
state->exponent = 1.0 - exp(-1.0 / (r * c * SAMPLE_RATE));
}
-INLINE double step_rc_filter(g80_filter_state *state, double input)
+static inline double step_rc_filter(g80_filter_state *state, double input)
{
state->capval += (input - state->capval) * state->exponent;
return state->capval;
}
-INLINE double step_cr_filter(g80_filter_state *state, double input)
+static inline double step_cr_filter(g80_filter_state *state, double input)
{
double result = (input - state->capval);
state->capval += (input - state->capval) * state->exponent;
@@ -503,7 +503,7 @@ READ8_MEMBER( usb_sound_device::t1_r )
*
*************************************/
-INLINE void clock_channel(timer8253_channel *ch)
+static inline void clock_channel(timer8253_channel *ch)
{
UINT8 lastgate = ch->lastgate;
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index e9983ad1cc9..b4dac235258 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -231,7 +231,7 @@ WRITE8_MEMBER( tx1_sound_device::ay8910_b_w )
***************************************************************************/
-INLINE void update_engine(int eng[4])
+static inline void update_engine(int eng[4])
{
int p0 = eng[0];
int p1 = eng[1];
diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp
index eb9947e9806..f6b77630522 100644
--- a/src/mame/audio/vboy.cpp
+++ b/src/mame/audio/vboy.cpp
@@ -184,8 +184,8 @@ static const INT8 outLvlTbl[16][16] = {
{ 0, 2, 4, 6, 8, 10, 12, 14, 16, 17, 19, 21, 23, 25, 27, 29}
};
-INLINE UINT8 mgetb(register UINT8 *ptr) { return *ptr; }
-INLINE void mputb(UINT8 *ptr, INT8 data) { *ptr = data; }
+static inline UINT8 mgetb(register UINT8 *ptr) { return *ptr; }
+static inline void mputb(UINT8 *ptr, INT8 data) { *ptr = data; }
//**************************************************************************
// LIVE DEVICE
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index e10e1fd8690..fcbd59370f4 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -103,7 +103,7 @@ public:
#define VERBOSE_LEVEL ( 3 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index 44986485ecd..d03be4447b5 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -222,7 +222,7 @@ UINT32 atarisy4_state::screen_update_atarisy4(screen_device &screen, bitmap_rgb3
return 0;
}
-INLINE UINT32 xy_to_screen_addr(UINT32 x, UINT32 y)
+static inline UINT32 xy_to_screen_addr(UINT32 x, UINT32 y)
{
// UINT32 offset = ((gpu.mcr >> 4) & 3) << 9;
UINT32 offset = 0;
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 9e01800ef5a..8b1e60376aa 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -38,7 +38,7 @@ TODO:
#include "softlist.h"
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index e7a2104d0fa..d1ed5d1b5e0 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -17,7 +17,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
@@ -835,12 +835,12 @@ void cxhumax_state::video_start()
The document also contains the constants below as floats.
--------------------------------------------------------------------------*/
-INLINE UINT8 clamp16_shift8(UINT32 x)
+static inline UINT8 clamp16_shift8(UINT32 x)
{
return (((INT32) x < 0) ? 0 : (x > 65535 ? 255: x >> 8));
}
-INLINE UINT32 ycc_to_rgb(UINT32 ycc)
+static inline UINT32 ycc_to_rgb(UINT32 ycc)
{
/* original equations:
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index a3b46e98f49..519ed10af03 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -686,7 +686,7 @@ void ddenlovr_state::do_plot( int x, int y, int pen )
}
-INLINE int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
+static inline int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
{
const int baddrmask = 0x7ffffff;
@@ -705,7 +705,7 @@ INLINE int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
return (src_data[baddr / 8] >> (7 - (baddr & 7))) & 1;
}
-INLINE int fetch_word( UINT8 *src_data, int src_len, int *bit_addr, int word_len )
+static inline int fetch_word( UINT8 *src_data, int src_len, int *bit_addr, int word_len )
{
int res = 0;
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 20c5e0bd787..24a6fe48f2c 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -43,7 +43,7 @@
#define VERBOSE_LEVEL ( 9 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index 3f8ae3f392a..abaea79d40d 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -22,7 +22,7 @@
#define VERBOSE_LEVEL (0)
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -1838,7 +1838,7 @@ WRITE32_MEMBER(gba_state::gba_io_w)
}
}
-INLINE UINT32 COMBINE_DATA32_16(UINT32 prev, UINT32 data, UINT32 mem_mask)
+static inline UINT32 COMBINE_DATA32_16(UINT32 prev, UINT32 data, UINT32 mem_mask)
{
COMBINE_DATA(&prev);
switch(mem_mask)
diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp
index 4627ddab5e6..4512c3db20f 100644
--- a/src/mame/drivers/gp32.cpp
+++ b/src/mame/drivers/gp32.cpp
@@ -25,7 +25,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 539a4dfdd20..e0a46ede44c 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -480,7 +480,7 @@ A12 <-> A13
}
}
-INLINE void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -491,7 +491,7 @@ INLINE void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor
}
memcpy(romptr,tmprom,igrosoft_gamble_ROM_SIZE);
}
-INLINE void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -519,7 +519,7 @@ static void lottery_decode(running_machine &machine, UINT8 xor12, UINT8 xor34, U
rom_decodeh(&igrosoft_gamble_gfx[0x380000], &temprom[0], xor78, xor_addr);
}
-INLINE void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -530,7 +530,7 @@ INLINE void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32
}
memcpy(romptr,tmprom,igrosoft_gamble_ROM_SIZE);
}
-INLINE void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
diff --git a/src/mame/drivers/namcoic.cpp b/src/mame/drivers/namcoic.cpp
index 1cc553b93eb..8790639cfe7 100644
--- a/src/mame/drivers/namcoic.cpp
+++ b/src/mame/drivers/namcoic.cpp
@@ -561,7 +561,7 @@ READ16_MEMBER( namcos2_shared_state::c355_obj_position_r )
return m_c355_obj_position[offset];
}
-INLINE UINT8
+static inline UINT8
nth_byte16( const UINT16 *pSource, int which )
{
UINT16 data = pSource[which/2];
@@ -579,7 +579,7 @@ nth_byte16( const UINT16 *pSource, int which )
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/2];
@@ -598,7 +598,7 @@ nth_word32( const UINT32 *pSource, int which )
* read from 32-bit aligned memory as if it were an array of bytes.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 66106e4bafd..0bda3aa8cb0 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1655,7 +1655,7 @@ float namcos23_state::f24_to_f32(UINT32 v)
return *(float *)&r;
}
-INLINE UINT8 light(UINT8 c, float l)
+static inline UINT8 light(UINT8 c, float l)
{
if(l < 1)
l = l*c;
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index c3aa6438a0e..f0683c72413 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -113,7 +113,7 @@ void photon2_state::video_start()
#if 0
/* return the color to be used inverting FLASHing colors if necessary */
-INLINE unsigned char get_display_color (unsigned char color, int invert)
+static inline unsigned char get_display_color (unsigned char color, int invert)
{
if (invert && (color & 0x80))
return (color & 0xc0) + ((color & 0x38) >> 3) + ((color & 0x07) << 3);
@@ -138,7 +138,7 @@ void photon2_state::screen_eof_spectrum(screen_device &screen, bool state)
}
}
-INLINE void spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color)
+static inline void spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color)
{
bitmap.pix16(y, x) = (UINT16)color;
}
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 137f034337c..99c9cf97a09 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -223,7 +223,7 @@ WRITE8_MEMBER(subsino2_state::ss9601_byte_lo2_w)
}
-INLINE void ss9601_videoram_w(layer_t *l, vram_t vram, address_space &space, offs_t offset, UINT8 data)
+static inline void ss9601_videoram_w(layer_t *l, vram_t vram, address_space &space, offs_t offset, UINT8 data)
{
l->videorams[vram][offset] = data;
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 6c472379b17..5f83ed30285 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -760,14 +760,14 @@ static const float dot3_tex_table[32] =
0.266666f, 0.300000f, 0.333333f, 0.366666f, 0.400000f, 0.433333f, 0.466666f, 0.500000f,
};
-INLINE float dot_product_vec3(VECTOR3 a, VECTOR3 b)
+static inline float dot_product_vec3(VECTOR3 a, VECTOR3 b)
{
return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]);
}
// Fast inverse square-root
// Adapted from http://en.wikipedia.org/wiki/Fast_inverse_square_root
-INLINE float finvsqrt(float number)
+static inline float finvsqrt(float number)
{
UINT32 i;
float x2, y;
@@ -783,7 +783,7 @@ INLINE float finvsqrt(float number)
}
#if 0
-INLINE void normalize_vec3(VECTOR3 *v)
+static inline void normalize_vec3(VECTOR3 *v)
{
float l = finvsqrt(*v[0] * *v[0] + *v[1] * *v[1] + *v[2] * *v[2]);
*v[0] *= l;
@@ -792,7 +792,7 @@ INLINE void normalize_vec3(VECTOR3 *v)
}
#endif
-INLINE float clamp_pos(float v)
+static inline float clamp_pos(float v)
{
if (v < 0.0f)
return 0.0f;
@@ -800,7 +800,7 @@ INLINE float clamp_pos(float v)
return v;
}
-INLINE UINT32 generate_texel_address(int iu, int iv)
+static inline UINT32 generate_texel_address(int iu, int iv)
{
// generate texel address from U and V
UINT32 addr = 0;
@@ -1074,7 +1074,7 @@ void taitotz_renderer::draw_scanline(INT32 scanline, const extent_t &extent, con
}
}
-INLINE int is_point_inside(float x, float y, float z, PLANE cp)
+static inline int is_point_inside(float x, float y, float z, PLANE cp)
{
float s = (x * cp.x) + (y * cp.y) + (z * cp.z) + cp.d;
if (s >= 0.0f)
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index 1cc8a78eaaa..9fee0bf3ff1 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -440,7 +440,7 @@ UINT32 viper_state::screen_update_viper(screen_device &screen, bitmap_rgb32 &bit
UINT32 m_mpc8240_regs[256/4];
-INLINE UINT64 read64le_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
+static inline UINT64 read64le_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -451,7 +451,7 @@ INLINE UINT64 read64le_with_32le_device_handler(read32_delegate handler, address
}
-INLINE void write64le_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
+static inline void write64le_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
handler(space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -459,7 +459,7 @@ INLINE void write64le_with_32le_device_handler(write32_delegate handler, address
handler(space, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
-INLINE UINT64 read64be_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
+static inline UINT64 read64be_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
@@ -468,7 +468,7 @@ INLINE UINT64 read64be_with_32le_device_handler(read32_delegate handler, address
}
-INLINE void write64be_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
+static inline void write64be_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 971b821fb82..cf19f15c8ff 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1452,7 +1452,7 @@ protected:
#define VERBOSE_LEVEL ( 5 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/etc/jrcrypt.cpp b/src/mame/etc/jrcrypt.cpp
index b1244151243..e973df30753 100644
--- a/src/mame/etc/jrcrypt.cpp
+++ b/src/mame/etc/jrcrypt.cpp
@@ -147,11 +147,11 @@ unsigned jrpacman_decode_roms(int address)
return RAM[address]; // this should never happen!
}
#else
-INLINE WordBit(word theWord, int theBit)
+static inline WordBit(word theWord, int theBit)
{
return (theWord >> theBit)&1;
}
-INLINE ByteBit(byte theByte, int theBit)
+static inline ByteBit(byte theByte, int theBit)
{
return (theByte >> theBit)&1;
}
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 64d7a7f6c03..e71cf24f55f 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -257,7 +257,7 @@ struct m2_poly_extra_data
};
-INLINE UINT16 get_texel( UINT32 base_x, UINT32 base_y, int x, int y, UINT32 *sheet )
+static inline UINT16 get_texel( UINT32 base_x, UINT32 base_y, int x, int y, UINT32 *sheet )
{
UINT32 baseoffs = ((base_y/2)*512)+(base_x/2);
UINT32 texeloffs = ((y/2)*512)+(x/2);
diff --git a/src/mame/machine/appldriv.cpp b/src/mame/machine/appldriv.cpp
index 1257b720e23..139da446140 100644
--- a/src/mame/machine/appldriv.cpp
+++ b/src/mame/machine/appldriv.cpp
@@ -19,7 +19,7 @@
#define PARENT_FLOPPY_2 "^floppy2"
#define PARENT_FLOPPY_3 "^floppy3"
-INLINE apple525_floppy_image_device *get_device(device_t *device)
+static inline apple525_floppy_image_device *get_device(device_t *device)
{
assert(device != nullptr);
assert(device->type() == FLOPPY_APPLE);
diff --git a/src/mame/machine/cdi070.cpp b/src/mame/machine/cdi070.cpp
index cc8f377d76a..892b625f2db 100644
--- a/src/mame/machine/cdi070.cpp
+++ b/src/mame/machine/cdi070.cpp
@@ -30,7 +30,7 @@ TODO:
const device_type MACHINE_CDI68070 = &device_creator<cdi68070_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(1,2) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(1,2) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp
index 75d10ddb125..a6fbd02da27 100644
--- a/src/mame/machine/cdicdic.cpp
+++ b/src/mame/machine/cdicdic.cpp
@@ -33,7 +33,7 @@ TODO:
const device_type MACHINE_CDICDIC = &device_creator<cdicdic_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -99,7 +99,7 @@ const INT32 cdicdic_device::s_cdic_adpcm_filter_coef[5][2] =
// INLINES
//**************************************************************************
-INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
+static inline int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
if(cdram8[2] != 0xff)
@@ -109,7 +109,7 @@ INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
return 0;
}
-INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
+static inline double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
switch(cdram8[2] & 0x3f)
@@ -129,7 +129,7 @@ INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
}
}
-INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
+static inline int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
switch(cdram8[2] & 0x3f)
@@ -151,7 +151,7 @@ INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
}
}
-INLINE INT16 clamp(INT16 in)
+static inline INT16 clamp(INT16 in)
{
return in;
}
diff --git a/src/mame/machine/cdislave.cpp b/src/mame/machine/cdislave.cpp
index ac9d4fe706f..e02b32f6221 100644
--- a/src/mame/machine/cdislave.cpp
+++ b/src/mame/machine/cdislave.cpp
@@ -32,7 +32,7 @@ const device_type MACHINE_CDISLAVE = &device_creator<cdislave_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp
index fbd3cb02515..9ec4ef16b35 100644
--- a/src/mame/machine/docg3.cpp
+++ b/src/mame/machine/docg3.cpp
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/fddebug.cpp b/src/mame/machine/fddebug.cpp
index 0a78590cb5c..61e019280db 100644
--- a/src/mame/machine/fddebug.cpp
+++ b/src/mame/machine/fddebug.cpp
@@ -309,7 +309,7 @@ static int validate_opcode(address_space &space, UINT32 pc, const UINT8 *opdata,
used to decrypt it
-----------------------------------------------*/
-INLINE int addr_to_keyaddr(offs_t address)
+static inline int addr_to_keyaddr(offs_t address)
{
/* for address xx0000-xx0006 (but only if >= 000008), use key xx2000-xx2006 */
if ((address & 0x0ffc) == 0 && address >= 4)
@@ -325,7 +325,7 @@ INLINE int addr_to_keyaddr(offs_t address)
always be 1
-----------------------------------------------*/
-INLINE UINT8 mask_for_keyaddr(offs_t address)
+static inline UINT8 mask_for_keyaddr(offs_t address)
{
/* the first half of the key always has bit 0x80 set; the second half 0x40 */
/* however, the values at 0000-0003 and 1000-1003 don't follow this rule */
@@ -343,7 +343,7 @@ INLINE UINT8 mask_for_keyaddr(offs_t address)
the specified number of steps
-----------------------------------------------*/
-INLINE UINT32 advance_seed(UINT32 seed, int count)
+static inline UINT32 advance_seed(UINT32 seed, int count)
{
/* iterate over the seed for 'count' reps */
while (count--)
@@ -360,7 +360,7 @@ INLINE UINT32 advance_seed(UINT32 seed, int count)
from a seed and apply the given mask
-----------------------------------------------*/
-INLINE UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
+static inline UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
{
/* put bits 16-21 of the seed in the low 6 bits and OR with the mask */
return ((~seed >> 16) & 0x3f) | mask;
@@ -373,7 +373,7 @@ INLINE UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
given seed
-----------------------------------------------*/
-INLINE void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32 seed)
+static inline void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32 seed)
{
int bytenum;
@@ -395,7 +395,7 @@ INLINE void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32
an opcode based on the opcode
-----------------------------------------------*/
-INLINE UINT8 get_opcode_length(UINT16 opcode)
+static inline UINT8 get_opcode_length(UINT16 opcode)
{
/* return the length from the table */
return optable[opcode].flags >> 28;
@@ -407,7 +407,7 @@ INLINE UINT8 get_opcode_length(UINT16 opcode)
constraint
-----------------------------------------------*/
-INLINE void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 state, UINT16 value, UINT16 mask)
+static inline void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 state, UINT16 value, UINT16 mask)
{
constraint->pc = pc;
constraint->state = state;
@@ -420,7 +420,7 @@ INLINE void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 stat
for a given address
-----------------------------------------------*/
-INLINE void print_possibilities(running_machine &machine)
+static inline void print_possibilities(running_machine &machine)
{
int i;
@@ -435,7 +435,7 @@ INLINE void print_possibilities(running_machine &machine)
0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
+static inline int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
{
/* if we're odd or out of range, fail */
if ((pc & 1) == 1)
@@ -453,7 +453,7 @@ INLINE int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
valid? 0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int addr_is_valid(address_space &space, UINT32 addr, UINT32 flags)
+static inline int addr_is_valid(address_space &space, UINT32 addr, UINT32 flags)
{
/* if this a JMP, the address is a PC */
if (flags & OF_JMP)
diff --git a/src/mame/machine/gaelco3d.cpp b/src/mame/machine/gaelco3d.cpp
index a8fe3f32590..d4f9c58383a 100644
--- a/src/mame/machine/gaelco3d.cpp
+++ b/src/mame/machine/gaelco3d.cpp
@@ -158,13 +158,13 @@ static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
INLINE FUNCTIONS
***************************************************************************/
-INLINE void shmem_lock(shmem_t *shmem)
+static inline void shmem_lock(shmem_t *shmem)
{
while (atomic_exchange32(&shmem->lock,1) == 0)
;
}
-INLINE void shmem_unlock(shmem_t *shmem)
+static inline void shmem_unlock(shmem_t *shmem)
{
atomic_exchange32(&shmem->lock,0);
}
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp
index 4c207dfe28f..f51d73dafb8 100644
--- a/src/mame/machine/micro3d.cpp
+++ b/src/mame/machine/micro3d.cpp
@@ -214,7 +214,7 @@ READ32_MEMBER(micro3d_state::micro3d_scc_r)
*
*************************************/
-INLINE INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
+static inline INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
{
INT64 result = ((INT64)v1->x * (INT64)v2->x) +
((INT64)v1->y * (INT64)v2->y) +
@@ -222,7 +222,7 @@ INLINE INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
return result;
}
-INLINE INT64 normalised_multiply(INT32 a, INT32 b)
+static inline INT64 normalised_multiply(INT32 a, INT32 b)
{
INT64 result;
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 783eb12ed3e..2d848da5d0f 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER(midway_serial_pic_device::write)
*
*************************************/
-INLINE UINT8 make_bcd(UINT8 data)
+static inline UINT8 make_bcd(UINT8 data)
{
return ((data / 10) << 4) | (data % 10);
}
diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp
index 91ce7e482e4..4918f1a1613 100644
--- a/src/mame/machine/n64.cpp
+++ b/src/mame/machine/n64.cpp
@@ -1739,7 +1739,7 @@ UINT8 n64_periphs::calc_mempak_crc(UINT8 *buffer, int length)
return crc;
}
-INLINE UINT8 convert_to_bcd(int val)
+static inline UINT8 convert_to_bcd(int val)
{
return ((val / 10) << 4) | (val % 10);
}
diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp
index 552ad78b3e4..069e9f224f1 100644
--- a/src/mame/machine/psxcd.cpp
+++ b/src/mame/machine/psxcd.cpp
@@ -6,7 +6,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp
index fe2259b5219..d9b6e8b8887 100644
--- a/src/mame/machine/sgi.cpp
+++ b/src/mame/machine/sgi.cpp
@@ -14,7 +14,7 @@
#define VERBOSE_LEVEL ( 2 )
#if 0
-INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/smartmed.cpp b/src/mame/machine/smartmed.cpp
index b3147c49316..f8295a4110d 100644
--- a/src/mame/machine/smartmed.cpp
+++ b/src/mame/machine/smartmed.cpp
@@ -30,13 +30,13 @@ struct UINT32BE
UINT8 bytes[4];
};
-INLINE UINT32 get_UINT32BE(UINT32BE word)
+static inline UINT32 get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
#ifdef UNUSED_FUNCTION
-INLINE void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
diff --git a/src/mame/machine/tx1.cpp b/src/mame/machine/tx1.cpp
index 93862c8c935..76658ae9231 100644
--- a/src/mame/machine/tx1.cpp
+++ b/src/mame/machine/tx1.cpp
@@ -20,7 +20,7 @@
#define ROL16(val, shift) ( ((UINT16)val << shift) | ((UINT16)val >> (16 - shift)) )
#define SWAP16(val) ( (((UINT16)val << 8) & 0xff00) | ((UINT16)val >> 8) )
-INLINE UINT8 reverse_nibble(UINT8 nibble)
+static inline UINT8 reverse_nibble(UINT8 nibble)
{
return (nibble & 1) << 3 |
(nibble & 2) << 1 |
@@ -402,7 +402,7 @@ enum
#define TX1_SET_INS0_BIT do { if (!(ins & 0x4) && math.i0ff) ins |= math.i0ff; } while(0)
-INLINE UINT16 get_tx1_datarom_addr(math_t &math)
+static inline UINT16 get_tx1_datarom_addr(math_t &math)
{
UINT16 addr;
@@ -960,7 +960,7 @@ enum
#define BB_SET_INS0_BIT do { if (!(ins & 0x4) && math.i0ff) ins |= math.i0ff;} while(0)
-INLINE UINT16 get_bb_datarom_addr(math_t &math)
+static inline UINT16 get_bb_datarom_addr(math_t &math)
{
UINT16 addr;
diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp
index 79651098c66..d049cc2e165 100644
--- a/src/mame/video/amiga.cpp
+++ b/src/mame/video/amiga.cpp
@@ -381,7 +381,7 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena
*
*************************************/
-INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
+static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
{
CUSTOM_REG(REG_SPR0DATA + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 0);
CUSTOM_REG(REG_SPR0DATB + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2);
@@ -457,7 +457,7 @@ static void update_sprite_dma(amiga_state *state, int scanline)
*
*************************************/
-INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
+static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
{
return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) |
(amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17);
@@ -557,7 +557,7 @@ static int get_sprite_pixel(amiga_state *state, int x)
*
*************************************/
-INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
+static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
{
UINT8 pix = (CUSTOM_REG(REG_BPL1DAT) >> obitoffs) & 1;
if (planes >= 3)
@@ -570,7 +570,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs
}
-INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
+static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
{
UINT8 pix = 0;
if (planes >= 2)
@@ -586,7 +586,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff
return pix;
}
-INLINE void fetch_bitplane_data(amiga_state *state, int plane)
+static inline void fetch_bitplane_data(amiga_state *state, int plane)
{
CUSTOM_REG(REG_BPL1DAT + plane) = state->chip_ram_r(CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2));
CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2) += 2;
@@ -599,7 +599,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane)
*
*************************************/
-INLINE int update_ham(amiga_state *state, int newpix)
+static inline int update_ham(amiga_state *state, int newpix)
{
switch (newpix >> 4)
{
diff --git a/src/mame/video/amigaaga.cpp b/src/mame/video/amigaaga.cpp
index 6af424998e0..88dac2caf91 100644
--- a/src/mame/video/amigaaga.cpp
+++ b/src/mame/video/amigaaga.cpp
@@ -89,7 +89,7 @@ VIDEO_START_MEMBER(amiga_state,amiga_aga)
*
*************************************/
-INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
+static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
{
switch((CUSTOM_REG(REG_FMODE) >> 2) & 0x03)
{
@@ -217,7 +217,7 @@ static void update_sprite_dma(amiga_state *state, int scanline)
*
*************************************/
-INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
+static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
{
return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) |
(amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17);
@@ -332,7 +332,7 @@ static int get_sprite_pixel(amiga_state *state, int x)
*
*************************************/
-INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
+static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
{
UINT64 *aga_bpldat = state->m_aga_bpldat;
UINT8 pix = (aga_bpldat[0] >> obitoffs) & 1;
@@ -350,7 +350,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs
}
-INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
+static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
{
UINT8 pix = 0;
if (planes >= 2)
@@ -371,7 +371,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff
return pix;
}
-INLINE void fetch_bitplane_data(amiga_state *state, int plane)
+static inline void fetch_bitplane_data(amiga_state *state, int plane)
{
UINT64 *aga_bpldat = state->m_aga_bpldat;
@@ -409,7 +409,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane)
*
*************************************/
-INLINE rgb_t update_ham(amiga_state *state, int newpix)
+static inline rgb_t update_ham(amiga_state *state, int newpix)
{
switch (newpix & 0x03)
{
diff --git a/src/mame/video/gba.cpp b/src/mame/video/gba.cpp
index e0883eafee1..17b8d926938 100644
--- a/src/mame/video/gba.cpp
+++ b/src/mame/video/gba.cpp
@@ -15,7 +15,7 @@
#define VERBOSE_LEVEL (0)
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -34,9 +34,9 @@ static const int coeff[32] = {
};
/* Utility functions */
-INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb);
-INLINE UINT32 increase_brightness(UINT32 color, int coeff_);
-INLINE UINT32 decrease_brightness(UINT32 color, int coeff_);
+static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb);
+static inline UINT32 increase_brightness(UINT32 color, int coeff_);
+static inline UINT32 decrease_brightness(UINT32 color, int coeff_);
#define GBA_MODE0 0
#define GBA_MODE1 1
@@ -1776,7 +1776,7 @@ inline int gba_state::is_in_window(int x, int window)
return 0;
}
-INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
+static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
{
if(color0 < 0x80000000)
{
@@ -1799,7 +1799,7 @@ INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
return color0;
}
-INLINE UINT32 increase_brightness(UINT32 color, int coeff_)
+static inline UINT32 increase_brightness(UINT32 color, int coeff_)
{
int r = (color >> 0) & 0x1f;
int g = (color >> 5) & 0x1f;
@@ -1816,7 +1816,7 @@ INLINE UINT32 increase_brightness(UINT32 color, int coeff_)
return (color & 0xffff0000) | (b << 10) | (g << 5) | r;
}
-INLINE UINT32 decrease_brightness(UINT32 color, int coeff_)
+static inline UINT32 decrease_brightness(UINT32 color, int coeff_)
{
int r = (color >> 0) & 0x1f;
int g = (color >> 5) & 0x1f;
diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp
index ac7084687b6..015c8ae0fac 100644
--- a/src/mame/video/hng64.cpp
+++ b/src/mame/video/hng64.cpp
@@ -220,7 +220,7 @@ static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap_t *tm
}
}
-INLINE UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level)
+static inline UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level)
{
UINT32 add;
add = (s & 0x00ff0000) + (d & 0x00ff0000);
diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp
index b7ce3aa158f..f29039970dc 100644
--- a/src/mame/video/k053936.cpp
+++ b/src/mame/video/k053936.cpp
@@ -433,7 +433,7 @@ void K053936GP_set_cliprect(int chip, int minx, int maxx, int miny, int maxy)
cliprect.set(minx, maxx, miny, maxy);
}
-INLINE void K053936GP_copyroz32clip( running_machine &machine,
+static inline void K053936GP_copyroz32clip( running_machine &machine,
bitmap_rgb32 &dst_bitmap, bitmap_ind16 &src_bitmap,
const rectangle &dst_cliprect, const rectangle &src_cliprect,
UINT32 _startx,UINT32 _starty,int _incxx,int _incxy,int _incyx,int _incyy,
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index a1720ccca1a..ab0b87a06fa 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -14,7 +14,7 @@
#define VERBOSE 0
-INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data);
+static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data);
void konamigx_state::konamigx_precache_registers(void)
@@ -1559,7 +1559,7 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma
return 0;
}
-INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
+static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
{
palette.set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift));
}
diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp
index aec55056c8f..d7912615bbf 100644
--- a/src/mame/video/mcd212.cpp
+++ b/src/mame/video/mcd212.cpp
@@ -30,7 +30,7 @@ TODO:
const device_type MACHINE_MCD212 = &device_creator<mcd212_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -729,7 +729,7 @@ void mcd212_device::process_dca(int channel)
m_channel[channel].dca = addr * 2;
}
-INLINE UINT8 MCD212_LIM(INT32 in)
+static inline UINT8 MCD212_LIM(INT32 in)
{
if(in < 0)
{
@@ -742,7 +742,7 @@ INLINE UINT8 MCD212_LIM(INT32 in)
return (UINT8)in;
}
-INLINE UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte)
+static inline UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte)
{
switch(icm)
{
diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp
index d0f7330a8d4..7cf60e4f6a5 100644
--- a/src/mame/video/midzeus.cpp
+++ b/src/mame/video/midzeus.cpp
@@ -114,10 +114,10 @@ static int is_mk4b;
*
*************************************/
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
/*************************************
@@ -160,25 +160,25 @@ INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
*
*************************************/
-INLINE void *waveram0_ptr_from_block_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_block_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 12) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH;
return WAVERAM_BLOCK1(blocknum);
}
-INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
+static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
{
UINT32 blocknum = (((addr & ~1) * width) / 8) % (WAVERAM0_WIDTH * WAVERAM0_HEIGHT);
return WAVERAM_BLOCK0(blocknum);
@@ -192,7 +192,7 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
*
*************************************/
-INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -202,13 +202,13 @@ INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
}
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot(int y, int x, UINT16 color)
+static inline void waveram_plot(int y, int x, UINT16 color)
{
if (zeus_cliprect.contains(x, y))
WAVERAM_WRITEPIX(zeus_renderbase, y, x, color);
}
-INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -221,7 +221,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
}
}
-INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -240,26 +240,26 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16
*************************************/
// 4x2 block size
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
}
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3);
return WAVERAM_READ8(base, byteoffs);
}
// 2x2 block size
-INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 4) << 3) + ((y & 3) << 1) + ((x / 2) & 1);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
}
-INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 2) << 3) + ((y & 3) << 1) + (x & 1);
return WAVERAM_READ8(base, byteoffs);
diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp
index 4b1c3d65689..670af222960 100644
--- a/src/mame/video/midzeus2.cpp
+++ b/src/mame/video/midzeus2.cpp
@@ -165,20 +165,20 @@ static int subregwrite_count[0x100];
*
*************************************/
-INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH;
return WAVERAM_BLOCK1(blocknum);
}
#ifdef UNUSED_FUNCTION
-INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
+static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
{
UINT32 blocknum = ((addr & ~1) * width) / 8;
return WAVERAM_BLOCK0(blocknum);
@@ -193,14 +193,14 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
*************************************/
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot(int y, int x, UINT32 color)
+static inline void waveram_plot(int y, int x, UINT32 color)
{
if (zeus_cliprect.contains(x, y))
WAVERAM_WRITEPIX(zeus_renderbase, y, x, color);
}
#endif
-INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -210,7 +210,7 @@ INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
}
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -225,7 +225,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
#endif
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -243,7 +243,7 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16
*
*************************************/
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3);
return WAVERAM_READ8(base, byteoffs);
@@ -251,7 +251,7 @@ INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
#ifdef UNUSED_FUNCTION
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp
index 93d41b28552..8915d2ee5c1 100644
--- a/src/mame/video/model2.cpp
+++ b/src/mame/video/model2.cpp
@@ -105,7 +105,7 @@
*
*******************************************/
-INLINE void transform_point( poly_vertex *point, float *matrix )
+static inline void transform_point( poly_vertex *point, float *matrix )
{
float tx = (point->x * matrix[0]) + (point->y * matrix[3]) + (point->pz * matrix[6]) + (matrix[9]);
float ty = (point->x * matrix[1]) + (point->y * matrix[4]) + (point->pz * matrix[7]) + (matrix[10]);
@@ -116,7 +116,7 @@ INLINE void transform_point( poly_vertex *point, float *matrix )
point->pz = tz;
}
-INLINE void transform_vector( poly_vertex *vector, float *matrix )
+static inline void transform_vector( poly_vertex *vector, float *matrix )
{
float tx = (vector->x * matrix[0]) + (vector->y * matrix[3]) + (vector->pz * matrix[6]);
float ty = (vector->x * matrix[1]) + (vector->y * matrix[4]) + (vector->pz * matrix[7]);
@@ -127,7 +127,7 @@ INLINE void transform_vector( poly_vertex *vector, float *matrix )
vector->pz = tz;
}
-INLINE void normalize_vector( poly_vertex *vector )
+static inline void normalize_vector( poly_vertex *vector )
{
float n = sqrt( (vector->x * vector->x) + (vector->y * vector->y) + (vector->pz * vector->pz) );
@@ -140,12 +140,12 @@ INLINE void normalize_vector( poly_vertex *vector )
}
}
-INLINE float dot_product( poly_vertex *v1, poly_vertex *v2 )
+static inline float dot_product( poly_vertex *v1, poly_vertex *v2 )
{
return (v1->x * v2->x) + (v1->y * v2->y) + (v1->pz * v2->pz);
}
-INLINE void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 )
+static inline void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 )
{
poly_vertex p1, p2;
diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp
index 4cea4a5a2e7..9e1e60be5d8 100644
--- a/src/mame/video/model3.cpp
+++ b/src/mame/video/model3.cpp
@@ -1312,7 +1312,7 @@ WRITE64_MEMBER(model3_state::real3d_cmd_w)
/*****************************************************************************/
/* matrix and vector operations */
-INLINE float dot_product3(VECTOR3 a, VECTOR3 b)
+static inline float dot_product3(VECTOR3 a, VECTOR3 b)
{
return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]);
}
diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp
index d15d63ac7eb..cf2f73805c6 100644
--- a/src/mame/video/namcofl.cpp
+++ b/src/mame/video/namcofl.cpp
@@ -11,7 +11,7 @@
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *source, int which )
{
source += which/2;
@@ -31,7 +31,7 @@ nth_word32( const UINT32 *source, int which )
* read from 32-bit aligned memory as if it were an array of bytes.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp
index cc38da66c8a..007ee859ad5 100644
--- a/src/mame/video/namconb1.cpp
+++ b/src/mame/video/namconb1.cpp
@@ -10,7 +10,7 @@
/* nth_word32 is a general-purpose utility function, which allows us to
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *source, int which )
{
source += which/2;
@@ -27,7 +27,7 @@ nth_word32( const UINT32 *source, int which )
/* nth_byte32 is a general-purpose utility function, which allows us to
* read from 32-bit aligned memory as if it were an array of bytes.
*/
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp
index 96ab3a18de1..d45dd94278d 100644
--- a/src/mame/video/namcos2.cpp
+++ b/src/mame/video/namcos2.cpp
@@ -64,7 +64,7 @@ struct roz_param
int wrap;
};
-INLINE void
+static inline void
draw_roz_helper_block(const struct roz_param *rozInfo, int destx, int desty,
int srcx, int srcy, int width, int height,
bitmap_ind16 &destbitmap, bitmap_ind8 &flagsbitmap,
diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp
index 8d331fbb60f..52aff54c3ce 100644
--- a/src/mame/video/newport.cpp
+++ b/src/mame/video/newport.cpp
@@ -32,7 +32,7 @@
#define VERBOSE_LEVEL ( 0 )
#if 0
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.inc
index 31f10f4858a..019a928a727 100644
--- a/src/mame/video/rdpfiltr.inc
+++ b/src/mame/video/rdpfiltr.inc
@@ -1,16 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
#if 0
-INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres);
-INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index);
-INLINE void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres);
-INLINE void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer);
-INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres);
-INLINE void restore_two(color_t* filtered, color_t* neighbour);
-INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb);
-INLINE UINT32 ge_two(UINT32 enb);
-
-INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres)
+static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres);
+static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index);
+static inline void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres);
+static inline void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer);
+static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres);
+static inline void restore_two(color_t* filtered, color_t* neighbour);
+static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb);
+static inline UINT32 ge_two(UINT32 enb);
+
+static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres)
{
color_t penumax, penumin, max, min;
UINT16 pix = *vbuff;
@@ -210,7 +210,7 @@ INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UI
}
// This needs to be fixed for endianness.
-INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index)
+static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index)
{
UINT8 leftr, leftg, leftb, rightr, rightg, rightb;
UINT16 leftpix, rightpix;
@@ -256,7 +256,7 @@ INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 f
}
}
-INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
+static inline void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
{
color_t leftpix = vibuffer[-1];
color_t rightpix = vibuffer[1];
@@ -303,7 +303,7 @@ INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
}
// Fix me.
-INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres)
+static inline void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres)
{
INT32 leftuppix = -hres - 1;
INT32 leftdownpix = hres - 1;
@@ -430,7 +430,7 @@ INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff
}
}
-INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres)
+static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres)
{
color_t filtered;
color_t leftuppix, leftdownpix, leftpix;
@@ -474,7 +474,7 @@ INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuf
}
// This is wrong, only the 5 upper bits are compared.
-INLINE void restore_two(color_t* filtered, color_t* neighbour)
+static inline void restore_two(color_t* filtered, color_t* neighbour)
{
if (neighbour->i.r > filtered->i.r)
{
@@ -502,7 +502,7 @@ INLINE void restore_two(color_t* filtered, color_t* neighbour)
}
}
-INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
+static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
{
int i;
int pos = 0;
@@ -526,7 +526,7 @@ INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
*max = Pixels[pos];
}
-INLINE UINT32 ge_two(UINT32 enb)
+static inline UINT32 ge_two(UINT32 enb)
{
if(enb & 1)
{
diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp
index 34656f1b9b1..3e150303609 100644
--- a/src/mame/video/tatsumi.cpp
+++ b/src/mame/video/tatsumi.cpp
@@ -169,7 +169,7 @@ VIDEO_START_MEMBER(tatsumi_state,bigfight)
/********************************************************************/
template<class _BitmapClass>
-INLINE void roundupt_drawgfxzoomrotate(tatsumi_state *state,
+static inline void roundupt_drawgfxzoomrotate(tatsumi_state *state,
_BitmapClass &dest_bmp, const rectangle &clip, gfx_element *gfx,
UINT32 code,UINT32 color,int flipx,int flipy,UINT32 ssx,UINT32 ssy,
int scalex, int scaley, int rotate, int write_priority_only )
diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp
index a265f3d3815..99ce602429b 100644
--- a/src/mame/video/victory.cpp
+++ b/src/mame/video/victory.cpp
@@ -510,7 +510,7 @@ Registers:
*
*************************************/
-INLINE void count_states(struct micro_t &micro, int states)
+static inline void count_states(struct micro_t &micro, int states)
{
attotime state_time = MICRO_STATE_CLOCK_PERIOD * states;
diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp
index 1b968053882..7b2af322548 100644
--- a/src/mame/video/vrender0.cpp
+++ b/src/mame/video/vrender0.cpp
@@ -116,7 +116,7 @@ no color in the palette will have this value
#define RGB32(r,g,b) ((r << 16) | (g << 8) | (b << 0))
#define RGB16(r,g,b) ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3)
-INLINE UINT16 RGB32TO16(UINT32 rgb)
+static inline UINT16 RGB32TO16(UINT32 rgb)
{
return (((rgb >> (16 + 3)) & 0x1f) << 11) | (((rgb >> (8 + 2)) & 0x3f) << 5) | (((rgb >> (3)) & 0x1f) << 0);
}
@@ -125,7 +125,7 @@ INLINE UINT16 RGB32TO16(UINT32 rgb)
#define EXTRACTG8(Src) (((Src >> 5) << 2) & 0xff)
#define EXTRACTB8(Src) (((Src >> 0) << 3) & 0xff)
-INLINE UINT16 Shade(UINT16 Src, UINT32 Shade)
+static inline UINT16 Shade(UINT16 Src, UINT32 Shade)
{
UINT32 scr = (EXTRACTR8(Src) * ((Shade >> 16) & 0xff)) >> 8;
UINT32 scg = (EXTRACTG8(Src) * ((Shade >> 8) & 0xff)) >> 8;
diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp
index 9cd1ef49871..9a7c78b1140 100644
--- a/src/mame/video/wgp.cpp
+++ b/src/mame/video/wgp.cpp
@@ -477,7 +477,7 @@ void wgp_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const
CUSTOM DRAW
*********************************************************/
-INLINE void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length,
+static inline void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length,
const UINT16 *src, int transparent, UINT32 orient, bitmap_ind8 &priority, int pri )
{
UINT16 *dsti = &bitmap.pix16(y, x);