summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-15 21:47:30 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-15 21:47:30 +0000
commitab97dc30efdd5cc1abf8c65b8ce29af364219167 (patch)
tree5ab46b3c21f6e0e4173a79a4151e019b3f2dc17e /src/osd
parentd1da89cc7817315f05269205a3f56d36ebba170b (diff)
First pass at modernizing struct definitions.
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/osdcore.h3
-rw-r--r--src/osd/sdl/debugwin.c3
-rw-r--r--src/osd/sdl/draw13.c9
-rw-r--r--src/osd/sdl/drawogl.c6
-rw-r--r--src/osd/sdl/drawsdl.c3
-rw-r--r--src/osd/sdl/gl_shader_mgr.h3
-rw-r--r--src/osd/sdl/input.c24
-rw-r--r--src/osd/sdl/sdlsync_sdl.c3
-rw-r--r--src/osd/sdl/sdlsync_tc.c3
-rw-r--r--src/osd/sdl/sdlwork.c3
-rw-r--r--src/osd/sdl/testkeys.c4
-rw-r--r--src/osd/sdl/video.h12
-rw-r--r--src/osd/sdl/window.c3
-rw-r--r--src/osd/sdl/window.h6
-rw-r--r--src/osd/windows/d3dcomm.h12
-rw-r--r--src/osd/windows/d3dhlsl.h3
-rw-r--r--src/osd/windows/d3dintf.h24
-rw-r--r--src/osd/windows/drawd3d.h3
-rw-r--r--src/osd/windows/drawdd.c9
-rw-r--r--src/osd/windows/drawgdi.c3
-rw-r--r--src/osd/windows/input.c15
-rw-r--r--src/osd/windows/ledutil.c3
-rw-r--r--src/osd/windows/output.c3
-rw-r--r--src/osd/windows/output.h3
-rw-r--r--src/osd/windows/video.h9
-rw-r--r--src/osd/windows/window.h3
-rw-r--r--src/osd/windows/winwork.c6
27 files changed, 60 insertions, 121 deletions
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h
index a34bbf2a705..25cee8510eb 100644
--- a/src/osd/osdcore.h
+++ b/src/osd/osdcore.h
@@ -281,8 +281,7 @@ typedef struct _osd_directory osd_directory;
/* osd_directory_entry contains basic information about a file when iterating through */
/* a directory */
-typedef struct _osd_directory_entry osd_directory_entry;
-struct _osd_directory_entry
+struct osd_directory_entry
{
const char * name; /* name of the entry */
osd_dir_entry_type type; /* type of the entry */
diff --git a/src/osd/sdl/debugwin.c b/src/osd/sdl/debugwin.c
index c4e4330c4b4..fb99313c38a 100644
--- a/src/osd/sdl/debugwin.c
+++ b/src/osd/sdl/debugwin.c
@@ -58,8 +58,7 @@ typedef struct hentry {
typedef struct _win_i win_i;
-typedef struct _edit edit;
-struct _edit {
+struct edit {
GtkEntry *edit_w;
struct hentry *h, *ch;
char *hold;
diff --git a/src/osd/sdl/draw13.c b/src/osd/sdl/draw13.c
index 4cf0a6126e0..ab41b544391 100644
--- a/src/osd/sdl/draw13.c
+++ b/src/osd/sdl/draw13.c
@@ -58,8 +58,7 @@ enum
//============================================================
-typedef struct _quad_setup_data quad_setup_data;
-struct _quad_setup_data
+struct quad_setup_data
{
INT32 dudx, dvdx, dudy, dvdy;
INT32 startu, startv;
@@ -70,8 +69,7 @@ typedef struct _texture_info texture_info;
typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *texsource);
-typedef struct _copy_info copy_info;
-struct _copy_info {
+struct copy_info {
int src_fmt;
Uint32 dst_fmt;
int dst_bpp;
@@ -117,8 +115,7 @@ struct _texture_info
};
/* sdl_info is the information about SDL for the current screen */
-typedef struct _sdl_info sdl_info;
-struct _sdl_info
+struct sdl_info
{
INT32 blittimer;
UINT32 extra_flags;
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index be744ea0003..f34f8732959 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -213,8 +213,7 @@ struct _texture_info
};
/* sdl_info is the information about SDL for the current screen */
-typedef struct _sdl_info sdl_info;
-struct _sdl_info
+struct sdl_info
{
INT32 blittimer;
UINT32 extra_flags;
@@ -269,8 +268,7 @@ struct _sdl_info
};
/* line_aa_step is used for drawing antialiased lines */
-typedef struct _line_aa_step line_aa_step;
-struct _line_aa_step
+struct line_aa_step
{
float xoffs, yoffs; // X/Y deltas
float weight; // weight contribution
diff --git a/src/osd/sdl/drawsdl.c b/src/osd/sdl/drawsdl.c
index 8fa25bdd148..2bb1a809b43 100644
--- a/src/osd/sdl/drawsdl.c
+++ b/src/osd/sdl/drawsdl.c
@@ -46,8 +46,7 @@ typedef struct _sdl_scale_mode sdl_scale_mode;
#endif
/* sdl_info is the information about SDL for the current screen */
-typedef struct _sdl_info sdl_info;
-struct _sdl_info
+struct sdl_info
{
INT32 blittimer;
UINT32 extra_flags;
diff --git a/src/osd/sdl/gl_shader_mgr.h b/src/osd/sdl/gl_shader_mgr.h
index 9eee4b1e757..595e0a68e49 100644
--- a/src/osd/sdl/gl_shader_mgr.h
+++ b/src/osd/sdl/gl_shader_mgr.h
@@ -22,8 +22,7 @@ typedef enum {
// old code passed sdl_info * to functions here
// however the parameter was not used
// changed interface to more generic one.
-typedef struct _glsl_shader_info glsl_shader_info;
-struct _glsl_shader_info
+struct glsl_shader_info
{
int dummy; // avoid compiler breakage
};
diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c
index 77f7f4a19cb..75aa92fcdd6 100644
--- a/src/osd/sdl/input.c
+++ b/src/osd/sdl/input.c
@@ -88,8 +88,7 @@ static int proximity_out_type = INVALID_EVENT_TYPE;
//============================================================
// state information for a keyboard
-typedef struct _keyboard_state keyboard_state;
-struct _keyboard_state
+struct keyboard_state
{
INT32 state[0x3ff]; // must be INT32!
INT8 oldkey[MAX_KEYS];
@@ -98,8 +97,7 @@ struct _keyboard_state
// state information for a mouse
-typedef struct _mouse_state mouse_state;
-struct _mouse_state
+struct mouse_state
{
INT32 lX, lY;
INT32 buttons[MAX_BUTTONS];
@@ -107,8 +105,7 @@ struct _mouse_state
// state information for a joystick; DirectInput state must be first element
-typedef struct _joystick_state joystick_state;
-struct _joystick_state
+struct joystick_state
{
SDL_Joystick *device;
INT32 axes[MAX_AXES];
@@ -119,8 +116,7 @@ struct _joystick_state
#if (USE_XINPUT)
// state information for a lightgun
-typedef struct _lightgun_state lightgun_state;
-struct _lightgun_state
+struct lightgun_state
{
INT32 lX, lY;
INT32 buttons[MAX_BUTTONS];
@@ -131,8 +127,7 @@ struct _lightgun_state
#endif
// generic device information
-typedef struct _device_info device_info;
-struct _device_info
+struct device_info
{
// device information
device_info ** head;
@@ -187,8 +182,7 @@ static device_info * joystick_list;
// joystick mapper
-typedef struct _device_map_t device_map_t;
-struct _device_map_t
+struct device_map_t
{
struct {
char *name;
@@ -236,8 +230,7 @@ static device_info *generic_device_find_index(device_info *devlist_head, int ind
//============================================================
// master keyboard translation table
-typedef struct _kt_table kt_table;
-struct _kt_table {
+struct kt_table {
input_item_id mame_key;
INT32 sdl_key;
//const char * vkey;
@@ -503,8 +496,7 @@ static kt_table sdl_key_trans_table[] =
};
#endif
-typedef struct _key_lookup_table key_lookup_table;
-struct _key_lookup_table
+struct key_lookup_table
{
int code;
const char *name;
diff --git a/src/osd/sdl/sdlsync_sdl.c b/src/osd/sdl/sdlsync_sdl.c
index 09107dbd401..734cbcc67f0 100644
--- a/src/osd/sdl/sdlsync_sdl.c
+++ b/src/osd/sdl/sdlsync_sdl.c
@@ -28,8 +28,7 @@
#else
#define LOG( x )
#endif
-typedef struct _hidden_mutex_t hidden_mutex_t;
-struct _hidden_mutex_t {
+struct hidden_mutex_t {
SDL_mutex * id;
volatile INT32 locked;
volatile INT32 threadid;
diff --git a/src/osd/sdl/sdlsync_tc.c b/src/osd/sdl/sdlsync_tc.c
index fc7b7c32cce..d1ad72e9bde 100644
--- a/src/osd/sdl/sdlsync_tc.c
+++ b/src/osd/sdl/sdlsync_tc.c
@@ -34,8 +34,7 @@
#include <signal.h>
#include <sys/time.h>
-typedef struct _hidden_mutex_t hidden_mutex_t;
-struct _hidden_mutex_t {
+struct hidden_mutex_t {
pthread_mutex_t id;
};
diff --git a/src/osd/sdl/sdlwork.c b/src/osd/sdl/sdlwork.c
index 74cb625d755..df9aae7efbe 100644
--- a/src/osd/sdl/sdlwork.c
+++ b/src/osd/sdl/sdlwork.c
@@ -71,8 +71,7 @@ int osd_num_processors = 0;
// TYPE DEFINITIONS
//============================================================
-typedef struct _work_thread_info work_thread_info;
-struct _work_thread_info
+struct work_thread_info
{
osd_work_queue * queue; // pointer back to the queue
osd_thread * handle; // handle to the thread
diff --git a/src/osd/sdl/testkeys.c b/src/osd/sdl/testkeys.c
index d7ba3352e5b..2530948dfe7 100644
--- a/src/osd/sdl/testkeys.c
+++ b/src/osd/sdl/testkeys.c
@@ -19,9 +19,7 @@
#include "unicode.h"
-typedef struct _key_lookup_table key_lookup_table;
-
-struct _key_lookup_table
+struct key_lookup_table
{
int code;
const char *name;
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index e143abd7324..38648c68ee8 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -50,15 +50,13 @@ enum {
// TYPE DEFINITIONS
//============================================================
-typedef struct _sdl_mode sdl_mode;
-struct _sdl_mode
+struct sdl_mode
{
int width;
int height;
};
-typedef struct _sdl_monitor_info sdl_monitor_info;
-struct _sdl_monitor_info
+struct sdl_monitor_info
{
sdl_monitor_info * next; // pointer to next monitor in list
#ifdef PTR64
@@ -75,8 +73,7 @@ struct _sdl_monitor_info
};
-typedef struct _sdl_window_config sdl_window_config;
-struct _sdl_window_config
+struct sdl_window_config
{
float aspect; // decoded aspect ratio
int width; // decoded width
@@ -88,8 +85,7 @@ struct _sdl_window_config
};
-typedef struct _sdl_video_config sdl_video_config;
-struct _sdl_video_config
+struct sdl_video_config
{
// performance options
int novideo; // don't draw, for pure CPU benchmarking
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index 933ad22fa1e..ada463b042d 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -100,8 +100,7 @@ static SDL_threadID window_threadid;
static sdl_draw_info draw;
-typedef struct _worker_param worker_param;
-struct _worker_param {
+struct worker_param {
running_machine &machine() const { assert(m_machine != NULL); return *m_machine; }
sdl_window_info *window;
render_primitive_list *list;
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index b5d98aaa891..352ed0d17e4 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -32,8 +32,7 @@ typedef UINT32 HashT;
// TYPE DEFINITIONS
//============================================================
-typedef struct _sdl_window_info sdl_window_info;
-struct _sdl_window_info
+struct sdl_window_info
{
// Pointer to next window
sdl_window_info * next;
@@ -101,8 +100,7 @@ struct _sdl_window_info
#endif
};
-typedef struct _sdl_draw_info sdl_draw_info;
-struct _sdl_draw_info
+struct sdl_draw_info
{
void (*exit)(void);
void (*attach)(sdl_draw_info *info, sdl_window_info *window);
diff --git a/src/osd/windows/d3dcomm.h b/src/osd/windows/d3dcomm.h
index 2b1e2c9defd..fedcd6ebbac 100644
--- a/src/osd/windows/d3dcomm.h
+++ b/src/osd/windows/d3dcomm.h
@@ -53,8 +53,7 @@
//============================================================
/* d3d_texture_info holds information about a texture */
-typedef struct _d3d_texture_info d3d_texture_info;
-struct _d3d_texture_info
+struct d3d_texture_info
{
d3d_texture_info * next; // next texture in the list
d3d_texture_info * prev; // prev texture in the list
@@ -79,8 +78,7 @@ struct _d3d_texture_info
/* d3d_poly_info holds information about a single polygon/d3d primitive */
-typedef struct _d3d_poly_info d3d_poly_info;
-struct _d3d_poly_info
+struct d3d_poly_info
{
D3DPRIMITIVETYPE type; // type of primitive
UINT32 count; // total number of primitives
@@ -92,8 +90,7 @@ struct _d3d_poly_info
/* d3d_vertex describes a single vertex */
-typedef struct _d3d_vertex d3d_vertex;
-struct _d3d_vertex
+struct d3d_vertex
{
float x, y, z; // X,Y,Z coordinates
float rhw; // RHW when no HLSL, padding when HLSL
@@ -103,8 +100,7 @@ struct _d3d_vertex
/* line_aa_step is used for drawing antialiased lines */
-typedef struct _line_aa_step line_aa_step;
-struct _line_aa_step
+struct line_aa_step
{
float xoffs, yoffs; // X/Y deltas
float weight; // weight contribution
diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h
index a723272d73a..9a82fff3daf 100644
--- a/src/osd/windows/d3dhlsl.h
+++ b/src/osd/windows/d3dhlsl.h
@@ -52,8 +52,7 @@
/* hlsl_options is the information about runtime-mutable Direct3D HLSL options */
/* in the future this will be moved into an OSD/emu shared buffer */
-typedef struct _hlsl_options hlsl_options;
-struct _hlsl_options
+struct hlsl_options
{
bool params_dirty;
float shadow_mask_alpha;
diff --git a/src/osd/windows/d3dintf.h b/src/osd/windows/d3dintf.h
index 2e5125670d8..ae4a84d4b6e 100644
--- a/src/osd/windows/d3dintf.h
+++ b/src/osd/windows/d3dintf.h
@@ -88,8 +88,7 @@ typedef D3DMATRIX d3d_matrix;
// Abstracted presentation parameters
//============================================================
-typedef struct _d3d_present_parameters d3d_present_parameters;
-struct _d3d_present_parameters
+struct d3d_present_parameters
{
UINT BackBufferWidth;
UINT BackBufferHeight;
@@ -112,8 +111,7 @@ struct _d3d_present_parameters
// Abstracted device identifier
//============================================================
-typedef struct _d3d_adapter_identifier d3d_adapter_identifier;
-struct _d3d_adapter_identifier
+struct d3d_adapter_identifier
{
char Driver[512];
char Description[512];
@@ -155,8 +153,7 @@ typedef enum _d3d_caps_index d3d_caps_index;
// Direct3D interfaces
//============================================================
-typedef struct _d3d_interface d3d_interface;
-struct _d3d_interface
+struct d3d_interface
{
HRESULT (*check_device_format)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format);
HRESULT (*check_device_type)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed);
@@ -176,8 +173,7 @@ struct _d3d_interface
// Direct3DDevice interfaces
//============================================================
-typedef struct _d3d_device_interface d3d_device_interface;
-struct _d3d_device_interface
+struct d3d_device_interface
{
HRESULT (*begin_scene)(d3d_device *dev);
HRESULT (*clear)(d3d_device *dev, DWORD count, const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil);
@@ -210,8 +206,7 @@ struct _d3d_device_interface
// Direct3DSurface interfaces
//============================================================
-typedef struct _d3d_surface_interface d3d_surface_interface;
-struct _d3d_surface_interface
+struct d3d_surface_interface
{
HRESULT (*lock_rect)(d3d_surface *surf, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags);
ULONG (*release)(d3d_surface *tex);
@@ -223,8 +218,7 @@ struct _d3d_surface_interface
// Direct3DTexture interfaces
//============================================================
-typedef struct _d3d_texture_interface d3d_texture_interface;
-struct _d3d_texture_interface
+struct d3d_texture_interface
{
HRESULT (*get_surface_level)(d3d_texture *tex, UINT level, d3d_surface **surface);
HRESULT (*lock_rect)(d3d_texture *tex, UINT level, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags);
@@ -237,8 +231,7 @@ struct _d3d_texture_interface
// Direct3DVertexBuffer interfaces
//============================================================
-typedef struct _d3d_vertex_buffer_interface d3d_vertex_buffer_interface;
-struct _d3d_vertex_buffer_interface
+struct d3d_vertex_buffer_interface
{
HRESULT (*lock)(d3d_vertex_buffer *vbuf, UINT offset, UINT size, VOID **data, DWORD flags);
ULONG (*release)(d3d_vertex_buffer *vbuf);
@@ -250,8 +243,7 @@ struct _d3d_vertex_buffer_interface
// Direct3DEffect interfaces
//============================================================
-typedef struct _d3d_effect_interface d3d_effect_interface;
-struct _d3d_effect_interface
+struct d3d_effect_interface
{
void (*begin)(d3d_effect *effect, UINT *passes, DWORD flags);
void (*end)(d3d_effect *effect);
diff --git a/src/osd/windows/drawd3d.h b/src/osd/windows/drawd3d.h
index 3dbafaafb0e..1bee718737c 100644
--- a/src/osd/windows/drawd3d.h
+++ b/src/osd/windows/drawd3d.h
@@ -60,8 +60,7 @@
//============================================================
/* d3d_info is the information about Direct3D for the current screen */
-typedef struct _d3d_info d3d_info;
-struct _d3d_info
+struct d3d_info
{
int adapter; // ordinal adapter number
int width, height; // current width, height
diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c
index 1d64143458d..25004360e09 100644
--- a/src/osd/windows/drawdd.c
+++ b/src/osd/windows/drawdd.c
@@ -69,8 +69,7 @@ typedef HRESULT (WINAPI *directdrawenumerateex_ptr)(LPDDENUMCALLBACKEXA lpCallba
/* dd_info is the information about DirectDraw for the current screen */
-typedef struct _dd_info dd_info;
-struct _dd_info
+struct dd_info
{
GUID adapter; // current display adapter
GUID * adapter_ptr; // pointer to current display adapter
@@ -101,8 +100,7 @@ struct _dd_info
/* monitor_enum_info holds information during a monitor enumeration */
-typedef struct _monitor_enum_info monitor_enum_info;
-struct _monitor_enum_info
+struct monitor_enum_info
{
win_monitor_info * monitor; // pointer to monitor we want
GUID guid; // GUID of the one we found
@@ -112,8 +110,7 @@ struct _monitor_enum_info
/* mode_enum_info holds information during a display mode enumeration */
-typedef struct _mode_enum_info mode_enum_info;
-struct _mode_enum_info
+struct mode_enum_info
{
win_window_info * window;
INT32 minimum_width, minimum_height;
diff --git a/src/osd/windows/drawgdi.c b/src/osd/windows/drawgdi.c
index e353e48fc9d..1ff77066f0a 100644
--- a/src/osd/windows/drawgdi.c
+++ b/src/osd/windows/drawgdi.c
@@ -57,8 +57,7 @@
//============================================================
/* gdi_info is the information for the current screen */
-typedef struct _gdi_info gdi_info;
-struct _gdi_info
+struct gdi_info
{
BITMAPINFO bminfo;
RGBQUAD colors[256];
diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c
index d8a4cff6444..e22b669efc4 100644
--- a/src/osd/windows/input.c
+++ b/src/osd/windows/input.c
@@ -112,8 +112,7 @@ enum
//============================================================
// state information for a keyboard; DirectInput state must be first element
-typedef struct _keyboard_state keyboard_state;
-struct _keyboard_state
+struct keyboard_state
{
UINT8 state[MAX_KEYS];
INT8 oldkey[MAX_KEYS];
@@ -122,8 +121,7 @@ struct _keyboard_state
// state information for a mouse; DirectInput state must be first element
-typedef struct _mouse_state mouse_state;
-struct _mouse_state
+struct mouse_state
{
DIMOUSESTATE2 state;
LONG raw_x, raw_y, raw_z;
@@ -131,8 +129,7 @@ struct _mouse_state
// state information for a joystick; DirectInput state must be first element
-typedef struct _joystick_state joystick_state;
-struct _joystick_state
+struct joystick_state
{
DIJOYSTATE state;
LONG rangemin[8];
@@ -141,8 +138,7 @@ struct _joystick_state
// DirectInput-specific information about a device
-typedef struct _dinput_device_info dinput_device_info;
-struct _dinput_device_info
+struct dinput_device_info
{
LPDIRECTINPUTDEVICE device;
LPDIRECTINPUTDEVICE2 device2;
@@ -152,8 +148,7 @@ struct _dinput_device_info
// RawInput-specific information about a device
-typedef struct _rawinput_device_info rawinput_device_info;
-struct _rawinput_device_info
+struct rawinput_device_info
{
HANDLE device;
};
diff --git a/src/osd/windows/ledutil.c b/src/osd/windows/ledutil.c
index 3f29167da84..962b4ab1498 100644
--- a/src/osd/windows/ledutil.c
+++ b/src/osd/windows/ledutil.c
@@ -138,8 +138,7 @@ typedef struct _KEYBOARD_INDICATOR_PARAMETERS
} KEYBOARD_INDICATOR_PARAMETERS, *PKEYBOARD_INDICATOR_PARAMETERS;
-typedef struct _id_map_entry id_map_entry;
-struct _id_map_entry
+struct id_map_entry
{
id_map_entry * next;
const char * name;
diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c
index e18c8ce67b0..637ba1f94f8 100644
--- a/src/osd/windows/output.c
+++ b/src/osd/windows/output.c
@@ -66,8 +66,7 @@
// TYPEDEFS
//============================================================
-typedef struct _registered_client registered_client;
-struct _registered_client
+struct registered_client
{
registered_client * next; // next client in the list
LPARAM id; // client-specified ID
diff --git a/src/osd/windows/output.h b/src/osd/windows/output.h
index 35da4039ac0..8e8919116e3 100644
--- a/src/osd/windows/output.h
+++ b/src/osd/windows/output.h
@@ -110,8 +110,7 @@
// TYPE DEFINITIONS
//============================================================
-typedef struct _copydata_id_string copydata_id_string;
-struct _copydata_id_string
+struct copydata_id_string
{
UINT32 id; // ID that was requested
char string[1]; // string array containing the data
diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h
index fb931845b1c..86e5107b1e1 100644
--- a/src/osd/windows/video.h
+++ b/src/osd/windows/video.h
@@ -62,8 +62,7 @@
// TYPE DEFINITIONS
//============================================================
-typedef struct _win_monitor_info win_monitor_info;
-struct _win_monitor_info
+struct win_monitor_info
{
win_monitor_info * next; // pointer to next monitor in list
HMONITOR handle; // handle to the monitor
@@ -74,8 +73,7 @@ struct _win_monitor_info
};
-typedef struct _win_window_config win_window_config;
-struct _win_window_config
+struct win_window_config
{
float aspect; // decoded aspect ratio
int width; // decoded width
@@ -84,8 +82,7 @@ struct _win_window_config
};
-typedef struct _win_video_config win_video_config;
-struct _win_video_config
+struct win_video_config
{
// global configuration
int windowed; // start windowed?
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 8b12c38f291..5e167c934a0 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -114,8 +114,7 @@ private:
};
-typedef struct _win_draw_callbacks win_draw_callbacks;
-struct _win_draw_callbacks
+struct win_draw_callbacks
{
void (*exit)(void);
diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c
index 2c2d9cbfbc7..5871ccbafdb 100644
--- a/src/osd/windows/winwork.c
+++ b/src/osd/windows/winwork.c
@@ -106,8 +106,7 @@ INLINE void YieldProcessor(void)
// TYPE DEFINITIONS
//============================================================
-typedef struct _scalable_lock scalable_lock;
-struct _scalable_lock
+struct scalable_lock
{
#if USE_SCALABLE_LOCKS
struct
@@ -122,8 +121,7 @@ struct _scalable_lock
};
-typedef struct _work_thread_info work_thread_info;
-struct _work_thread_info
+struct work_thread_info
{
osd_work_queue * queue; // pointer back to the queue
HANDLE handle; // handle to the thread