summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/debug/debugcmd.cpp8
-rw-r--r--src/emu/debug/dvmemory.cpp4
-rw-r--r--src/emu/debug/textbuf.cpp4
-rw-r--r--src/emu/debugger.h14
-rw-r--r--src/emu/output.cpp6
-rw-r--r--src/emu/output.h12
-rw-r--r--src/emu/rendutil.h22
-rw-r--r--src/emu/sound/filter.h2
-rw-r--r--src/emu/ui/ui.cpp2
-rw-r--r--src/emu/uiinput.h12
10 files changed, 43 insertions, 43 deletions
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 08eec1307bd..328079095c9 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -168,7 +168,7 @@ static void execute_dumpkbd(running_machine &machine, int ref, int params, const
given address is valid for cheating
-------------------------------------------------*/
-INLINE int cheat_address_is_valid(address_space &space, offs_t address)
+static inline int cheat_address_is_valid(address_space &space, offs_t address)
{
return debug_cpu_translate(space, TRANSLATE_READ, &address) && (space.get_write_ptr(address) != nullptr);
}
@@ -179,7 +179,7 @@ INLINE int cheat_address_is_valid(address_space &space, offs_t address)
the current cheat width, if signed
-------------------------------------------------*/
-INLINE UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
+static inline UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
{
if (cheatsys->signed_cheat)
{
@@ -196,7 +196,7 @@ INLINE UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
cheat_byte_swap - swap a value
-------------------------------------------------*/
-INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
+static inline UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
{
if (cheatsys->swapped_cheat)
{
@@ -217,7 +217,7 @@ INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
and swapping if necessary
-------------------------------------------------*/
-INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space &space, offs_t address)
+static inline UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space &space, offs_t address)
{
return cheat_sign_extend(cheatsys, cheat_byte_swap(cheatsys, debug_read_memory(space, address, cheatsys->width, TRUE)));
}
diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
index 1bff6cc81b1..2327d7284cc 100644
--- a/src/emu/debug/dvmemory.cpp
+++ b/src/emu/debug/dvmemory.cpp
@@ -211,7 +211,7 @@ void debug_view_memory::view_notify(debug_view_notification type)
// whose 32 bit representation is value
//-------------------------------------------------
-INLINE float uint32_to_float(UINT32 value)
+static inline float uint32_to_float(UINT32 value)
{
union {
float f;
@@ -227,7 +227,7 @@ INLINE float uint32_to_float(UINT32 value)
// whose 64 bit representation is value
//-------------------------------------------------
-INLINE float uint64_to_double(UINT64 value)
+static inline float uint64_to_double(UINT64 value)
{
union {
double f;
diff --git a/src/emu/debug/textbuf.cpp b/src/emu/debug/textbuf.cpp
index cd96be9cd5a..e7daf96571a 100644
--- a/src/emu/debug/textbuf.cpp
+++ b/src/emu/debug/textbuf.cpp
@@ -50,7 +50,7 @@ struct text_buffer
currently held in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_used(text_buffer *text)
+static inline INT32 buffer_used(text_buffer *text)
{
INT32 used = text->bufend - text->bufstart;
if (used < 0)
@@ -64,7 +64,7 @@ INLINE INT32 buffer_used(text_buffer *text)
available in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_space(text_buffer *text)
+static inline INT32 buffer_space(text_buffer *text)
{
return text->bufsize - buffer_used(text);
}
diff --git a/src/emu/debugger.h b/src/emu/debugger.h
index fe59fc6df52..bde3ad7572b 100644
--- a/src/emu/debugger.h
+++ b/src/emu/debugger.h
@@ -41,7 +41,7 @@ void debugger_flush_all_traces_on_abnormal_exit(void);
this once per instruction from CPU cores
-------------------------------------------------*/
-INLINE void debugger_instruction_hook(device_t *device, offs_t curpc)
+static inline void debugger_instruction_hook(device_t *device, offs_t curpc)
{
#ifndef MAME_DEBUG_FAST
if ((device->machine().debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
@@ -55,7 +55,7 @@ INLINE void debugger_instruction_hook(device_t *device, offs_t curpc)
anytime an exception is generated
-------------------------------------------------*/
-INLINE void debugger_exception_hook(device_t *device, int exception)
+static inline void debugger_exception_hook(device_t *device, int exception)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->exception_hook(exception);
@@ -73,7 +73,7 @@ INLINE void debugger_exception_hook(device_t *device, int exception)
execution for the given CPU
-------------------------------------------------*/
-INLINE void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
+static inline void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->start_hook(endtime);
@@ -86,7 +86,7 @@ INLINE void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
for the given CPU
-------------------------------------------------*/
-INLINE void debugger_stop_cpu_hook(device_t *device)
+static inline void debugger_stop_cpu_hook(device_t *device)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->stop_hook();
@@ -99,7 +99,7 @@ INLINE void debugger_stop_cpu_hook(device_t *device)
acknowledged
-------------------------------------------------*/
-INLINE void debugger_interrupt_hook(device_t *device, int irqline)
+static inline void debugger_interrupt_hook(device_t *device, int irqline)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->interrupt_hook(irqline);
@@ -116,7 +116,7 @@ INLINE void debugger_interrupt_hook(device_t *device, int irqline)
next opportunity
-------------------------------------------------*/
-INLINE void debugger_break(running_machine &machine)
+static inline void debugger_break(running_machine &machine)
{
if ((machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
debug_cpu_get_visible_cpu(machine)->debug()->halt_on_next_instruction("Internal breakpoint\n");
@@ -129,7 +129,7 @@ INLINE void debugger_break(running_machine &machine)
halted within the instruction hook
-------------------------------------------------*/
-INLINE int debugger_within_instruction_hook(running_machine &machine)
+static inline int debugger_within_instruction_hook(running_machine &machine)
{
if ((machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
return debug_cpu_within_instruction_hook(machine);
diff --git a/src/emu/output.cpp b/src/emu/output.cpp
index e2e919dfaa3..3977c0e809b 100644
--- a/src/emu/output.cpp
+++ b/src/emu/output.cpp
@@ -78,7 +78,7 @@ static void output_exit(running_machine &machine);
get_hash - return the hash of an output value
-------------------------------------------------*/
-INLINE UINT32 get_hash(const char *string)
+static inline UINT32 get_hash(const char *string)
{
return core_crc32(0, (UINT8 *)string, (UINT32)strlen(string));
}
@@ -88,7 +88,7 @@ INLINE UINT32 get_hash(const char *string)
find_item - find an item based on a string
-------------------------------------------------*/
-INLINE output_item *find_item(const char *string)
+static inline output_item *find_item(const char *string)
{
UINT32 hash = get_hash(string);
output_item *item;
@@ -106,7 +106,7 @@ INLINE output_item *find_item(const char *string)
create_new_item - create a new item
-------------------------------------------------*/
-INLINE output_item *create_new_item(const char *outname, INT32 value)
+static inline output_item *create_new_item(const char *outname, INT32 value)
{
auto item = global_alloc(output_item);
UINT32 hash = get_hash(outname);
diff --git a/src/emu/output.h b/src/emu/output.h
index 9ab4fd86b12..95f8e40d821 100644
--- a/src/emu/output.h
+++ b/src/emu/output.h
@@ -62,33 +62,33 @@ const char *output_id_to_name(UINT32 id);
INLINES
***************************************************************************/
-INLINE void output_set_led_value(int index, int value)
+static inline void output_set_led_value(int index, int value)
{
output_set_indexed_value("led", index, value ? 1 : 0);
}
-INLINE void output_set_lamp_value(int index, int value)
+static inline void output_set_lamp_value(int index, int value)
{
output_set_indexed_value("lamp", index, value);
}
-INLINE void output_set_digit_value(int index, int value)
+static inline void output_set_digit_value(int index, int value)
{
output_set_indexed_value("digit", index, value);
}
-INLINE INT32 output_get_led_value(int index)
+static inline INT32 output_get_led_value(int index)
{
return output_get_indexed_value("led", index);
}
-INLINE INT32 output_get_lamp_value(int index)
+static inline INT32 output_get_lamp_value(int index)
{
return output_get_indexed_value("lamp", index);
}
-INLINE INT32 output_get_digit_value(int index)
+static inline INT32 output_get_digit_value(int index)
{
return output_get_indexed_value("digit", index);
}
diff --git a/src/emu/rendutil.h b/src/emu/rendutil.h
index 22c75d42ce6..d992d35d88c 100644
--- a/src/emu/rendutil.h
+++ b/src/emu/rendutil.h
@@ -38,7 +38,7 @@ bool render_load_png(bitmap_argb32 &bitmap, emu_file &file, const char *dirname,
round-to-nearest
-------------------------------------------------*/
-INLINE float render_round_nearest(float f)
+static inline float render_round_nearest(float f)
{
return floor(f + 0.5f);
}
@@ -49,7 +49,7 @@ INLINE float render_round_nearest(float f)
bounds
-------------------------------------------------*/
-INLINE void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, float x1, float y1)
+static inline void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, float x1, float y1)
{
bounds->x0 = x0;
bounds->y0 = y0;
@@ -63,7 +63,7 @@ INLINE void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, floa
bounds
-------------------------------------------------*/
-INLINE void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, float width, float height)
+static inline void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, float width, float height)
{
bounds->x0 = x0;
bounds->y0 = y0;
@@ -77,7 +77,7 @@ INLINE void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, floa
of two render_bounds
-------------------------------------------------*/
-INLINE void sect_render_bounds(render_bounds *dest, const render_bounds *src)
+static inline void sect_render_bounds(render_bounds *dest, const render_bounds *src)
{
dest->x0 = (dest->x0 > src->x0) ? dest->x0 : src->x0;
dest->x1 = (dest->x1 < src->x1) ? dest->x1 : src->x1;
@@ -91,7 +91,7 @@ INLINE void sect_render_bounds(render_bounds *dest, const render_bounds *src)
render_bounds
-------------------------------------------------*/
-INLINE void union_render_bounds(render_bounds *dest, const render_bounds *src)
+static inline void union_render_bounds(render_bounds *dest, const render_bounds *src)
{
dest->x0 = (dest->x0 < src->x0) ? dest->x0 : src->x0;
dest->x1 = (dest->x1 > src->x1) ? dest->x1 : src->x1;
@@ -104,7 +104,7 @@ INLINE void union_render_bounds(render_bounds *dest, const render_bounds *src)
set_render_color - cleaner way to set a color
-------------------------------------------------*/
-INLINE void set_render_color(render_color *color, float a, float r, float g, float b)
+static inline void set_render_color(render_color *color, float a, float r, float g, float b)
{
color->a = a;
color->r = r;
@@ -118,7 +118,7 @@ INLINE void set_render_color(render_color *color, float a, float r, float g, flo
flip flags
-------------------------------------------------*/
-INLINE int orientation_swap_flips(int orientation)
+static inline int orientation_swap_flips(int orientation)
{
return (orientation & ORIENTATION_SWAP_XY) |
((orientation & ORIENTATION_FLIP_X) ? ORIENTATION_FLIP_Y : 0) |
@@ -131,7 +131,7 @@ INLINE int orientation_swap_flips(int orientation)
that will undo another orientation
-------------------------------------------------*/
-INLINE int orientation_reverse(int orientation)
+static inline int orientation_reverse(int orientation)
{
/* if not swapping X/Y, then just apply the same transform to reverse */
if (!(orientation & ORIENTATION_SWAP_XY))
@@ -148,7 +148,7 @@ INLINE int orientation_reverse(int orientation)
after applying two subsequent orientations
-------------------------------------------------*/
-INLINE int orientation_add(int orientation1, int orientation2)
+static inline int orientation_add(int orientation1, int orientation2)
{
/* if the 2nd transform doesn't swap, just XOR together */
if (!(orientation2 & ORIENTATION_SWAP_XY))
@@ -166,7 +166,7 @@ INLINE int orientation_add(int orientation1, int orientation2)
a single RGB component
-------------------------------------------------*/
-INLINE float apply_brightness_contrast_gamma_fp(float srcval, float brightness, float contrast, float gamma)
+static inline float apply_brightness_contrast_gamma_fp(float srcval, float brightness, float contrast, float gamma)
{
/* first apply gamma */
srcval = pow(srcval, 1.0f / gamma);
@@ -189,7 +189,7 @@ INLINE float apply_brightness_contrast_gamma_fp(float srcval, float brightness,
a single RGB component
-------------------------------------------------*/
-INLINE UINT8 apply_brightness_contrast_gamma(UINT8 src, float brightness, float contrast, float gamma)
+static inline UINT8 apply_brightness_contrast_gamma(UINT8 src, float brightness, float contrast, float gamma)
{
float srcval = (float)src * (1.0f / 255.0f);
float result = apply_brightness_contrast_gamma_fp(srcval, brightness, contrast, gamma);
diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h
index 5e671e85545..7e7398a2686 100644
--- a/src/emu/sound/filter.h
+++ b/src/emu/sound/filter.h
@@ -44,7 +44,7 @@ void filter_state_free(filter_state* s);
void filter_state_reset(filter* f, filter_state* s);
/* Insert a value in the filter state */
-INLINE void filter_insert(filter* f, filter_state* s, filter_real x) {
+static inline void filter_insert(filter* f, filter_state* s, filter_real x) {
/* next state */
++s->prev_mac;
if (s->prev_mac >= f->order)
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 02522bc896a..3a016b25b10 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -143,7 +143,7 @@ static INT32 slider_crossoffset(running_machine &machine, void *arg, std::string
// character a possible line break?
//-------------------------------------------------
-INLINE int is_breakable_char(unicode_char ch)
+static inline int is_breakable_char(unicode_char ch)
{
// regular spaces and hyphens are breakable
if (ch == ' ' || ch == '-')
diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h
index d5f85e2ff02..3b7a63d420d 100644
--- a/src/emu/uiinput.h
+++ b/src/emu/uiinput.h
@@ -93,7 +93,7 @@ bool ui_input_pressed_repeat(running_machine &machine, int code, int speed);
move event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_move_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_move_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_MOVE;
@@ -109,7 +109,7 @@ INLINE void ui_input_push_mouse_move_event(running_machine &machine, render_targ
mouse leave event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_leave_event(running_machine &machine, render_target *target)
+static inline void ui_input_push_mouse_leave_event(running_machine &machine, render_target *target)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_LEAVE;
@@ -123,7 +123,7 @@ INLINE void ui_input_push_mouse_leave_event(running_machine &machine, render_tar
down event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_down_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_down_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_DOWN;
@@ -139,7 +139,7 @@ INLINE void ui_input_push_mouse_down_event(running_machine &machine, render_targ
down event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_up_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_up_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_UP;
@@ -156,7 +156,7 @@ INLINE void ui_input_push_mouse_up_event(running_machine &machine, render_target
render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_double_click_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_double_click_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_DOUBLE_CLICK;
@@ -172,7 +172,7 @@ INLINE void ui_input_push_mouse_double_click_event(running_machine &machine, ren
to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_char_event(running_machine &machine, render_target *target, unicode_char ch)
+static inline void ui_input_push_char_event(running_machine &machine, render_target *target, unicode_char ch)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_CHAR;