summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-16 05:24:30 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-16 05:24:30 +0000
commit1a301849034da9956b893453acce8e0f9168e150 (patch)
treea39f7a6c6b4c54b7993e58cd22ea6b6bd25f37cf /src/osd/sdl
parent91f928d6cd774c9526c7fde7e0860aded24d08a5 (diff)
Final round of struct/union/enum normalization.
Diffstat (limited to 'src/osd/sdl')
-rw-r--r--src/osd/sdl/debugwin.c8
-rw-r--r--src/osd/sdl/draw13.c4
-rw-r--r--src/osd/sdl/drawogl.c4
-rw-r--r--src/osd/sdl/drawsdl.c4
-rw-r--r--src/osd/sdl/dview.h8
-rw-r--r--src/osd/sdl/osd_opengl.h4
-rw-r--r--src/osd/sdl/sdldir.c2
-rw-r--r--src/osd/sdl/sdlfile.h2
-rw-r--r--src/osd/sdl/sdlsync.h6
-rw-r--r--src/osd/sdl/sdlsync_ntc.c8
-rw-r--r--src/osd/sdl/sdlsync_os2.c8
-rw-r--r--src/osd/sdl/sdlsync_sdl.c6
-rw-r--r--src/osd/sdl/sdlsync_tc.c6
-rw-r--r--src/osd/sdl/sdlsync_win32.c6
-rw-r--r--src/osd/sdl/sdlwork.c4
15 files changed, 39 insertions, 41 deletions
diff --git a/src/osd/sdl/debugwin.c b/src/osd/sdl/debugwin.c
index fb99313c38a..ef3193f9cba 100644
--- a/src/osd/sdl/debugwin.c
+++ b/src/osd/sdl/debugwin.c
@@ -51,12 +51,12 @@ enum {
//============================================================
-typedef struct hentry {
+struct hentry {
struct hentry *h;
char *e;
-} hentry;
+};
-typedef struct _win_i win_i;
+struct win_i;
struct edit {
GtkEntry *edit_w;
@@ -67,7 +67,7 @@ struct edit {
win_i *cbp;
};
-struct _win_i {
+struct win_i {
int type;
win_i * next;
GtkWidget * win;
diff --git a/src/osd/sdl/draw13.c b/src/osd/sdl/draw13.c
index ab41b544391..365a91ec856 100644
--- a/src/osd/sdl/draw13.c
+++ b/src/osd/sdl/draw13.c
@@ -65,7 +65,7 @@ struct quad_setup_data
INT32 rotwidth, rotheight;
};
-typedef struct _texture_info texture_info;
+struct texture_info;
typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *texsource);
@@ -88,7 +88,7 @@ struct copy_info {
};
/* texture_info holds information about a texture */
-struct _texture_info
+struct texture_info
{
texture_info * next; // next texture in the list
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index f34f8732959..734c2b0b8ff 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -160,14 +160,14 @@ enum
// TYPES
//============================================================
-typedef struct _texture_info texture_info;
+struct texture_info;
#if USE_OPENGL
typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *texsource);
#endif
/* texture_info holds information about a texture */
-struct _texture_info
+struct texture_info
{
#ifdef OLD_CODE
texture_info * next; // next texture in the list
diff --git a/src/osd/sdl/drawsdl.c b/src/osd/sdl/drawsdl.c
index 2bb1a809b43..49e9f85ac75 100644
--- a/src/osd/sdl/drawsdl.c
+++ b/src/osd/sdl/drawsdl.c
@@ -37,7 +37,7 @@
// TYPES
//============================================================
-typedef struct _sdl_scale_mode sdl_scale_mode;
+struct sdl_scale_mode;
#if (SDLMAME_SDL2)
#define DRAW2_SCALEMODE_NEAREST "0"
@@ -75,7 +75,7 @@ struct sdl_info
int old_blitheight;
};
-struct _sdl_scale_mode
+struct sdl_scale_mode
{
const char *name;
int is_scale; /* Scale mode? */
diff --git a/src/osd/sdl/dview.h b/src/osd/sdl/dview.h
index b785c6590cd..f6e26aa1441 100644
--- a/src/osd/sdl/dview.h
+++ b/src/osd/sdl/dview.h
@@ -21,17 +21,17 @@ GType dview_get_type(void);
#define DVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), DVIEW_TYPE, DViewClass))
-typedef struct _DViewClass DViewClass;
-typedef struct _DView DView;
+struct DViewClass;
+struct DView;
-struct _DViewClass
+struct DViewClass
{
GtkContainerClass parent_class;
PangoFontDescription *fixedfont;
int fixedfont_width, fixedfont_height;
};
-struct _DView
+struct DView
{
GtkContainer parent;
GtkAdjustment *hadj, *vadj;
diff --git a/src/osd/sdl/osd_opengl.h b/src/osd/sdl/osd_opengl.h
index c84d0a94139..e51b7e52559 100644
--- a/src/osd/sdl/osd_opengl.h
+++ b/src/osd/sdl/osd_opengl.h
@@ -54,9 +54,7 @@
#define OSD_GL(ret,func,params) ret (APIENTRY *func) params;
#define OSD_GL_UNUSED(ret,func,params)
- typedef struct _osd_gl_dispatch osd_gl_dispatch;
-
- struct _osd_gl_dispatch
+ struct osd_gl_dispatch
{
#define GET_GLFUNC 1
#include "osd_opengl.h"
diff --git a/src/osd/sdl/sdldir.c b/src/osd/sdl/sdldir.c
index b107db36767..988cde22bab 100644
--- a/src/osd/sdl/sdldir.c
+++ b/src/osd/sdl/sdldir.c
@@ -57,7 +57,7 @@ typedef struct stat64 sdl_stat;
#define HAS_DT_XXX defined(SDLMAME_LINUX) || defined(SDLMAME_BSD) || defined(SDLMAME_DARWIN)
-struct _osd_directory
+struct osd_directory
{
osd_directory_entry ent;
sdl_dirent *data;
diff --git a/src/osd/sdl/sdlfile.h b/src/osd/sdl/sdlfile.h
index cb048e100e0..16a8eec66ad 100644
--- a/src/osd/sdl/sdlfile.h
+++ b/src/osd/sdl/sdlfile.h
@@ -26,7 +26,7 @@ enum
// TYPE DEFINITIONS
//============================================================
-struct _osd_file
+struct osd_file
{
int handle;
int type;
diff --git a/src/osd/sdl/sdlsync.h b/src/osd/sdl/sdlsync.h
index d581418460d..d7b273313ec 100644
--- a/src/osd/sdl/sdlsync.h
+++ b/src/osd/sdl/sdlsync.h
@@ -18,7 +18,7 @@
/* osd_event is an opaque type which represents a setable/resetable event */
-typedef struct _osd_event osd_event;
+struct osd_event;
/*-----------------------------------------------------------------------------
@@ -107,7 +107,7 @@ void osd_event_free(osd_event *event);
***************************************************************************/
/* osd_thread is an opaque type which represents a thread */
-typedef struct _osd_thread osd_thread;
+struct osd_thread;
/* osd_thread_callback is a callback function that will be called from the thread */
@@ -191,7 +191,7 @@ void osd_process_kill(void);
// Scalable Locks
//============================================================
-typedef struct _osd_scalable_lock osd_scalable_lock;
+struct osd_scalable_lock;
osd_scalable_lock *osd_scalable_lock_alloc(void);
diff --git a/src/osd/sdl/sdlsync_ntc.c b/src/osd/sdl/sdlsync_ntc.c
index b7d3c2fa994..4afd5cacdf6 100644
--- a/src/osd/sdl/sdlsync_ntc.c
+++ b/src/osd/sdl/sdlsync_ntc.c
@@ -40,7 +40,7 @@
#include <errno.h>
#include <sys/time.h>
-struct _osd_lock {
+struct osd_lock {
volatile pthread_t holder;
INT32 count;
#ifdef PTR64
@@ -50,7 +50,7 @@ struct _osd_lock {
#endif
};
-struct _osd_event {
+struct osd_event {
pthread_mutex_t mutex;
pthread_cond_t cond;
volatile INT32 autoreset;
@@ -67,11 +67,11 @@ struct _osd_event {
// TYPE DEFINITIONS
//============================================================
-struct _osd_thread {
+struct osd_thread {
pthread_t thread;
};
-struct _osd_scalable_lock
+struct osd_scalable_lock
{
struct
{
diff --git a/src/osd/sdl/sdlsync_os2.c b/src/osd/sdl/sdlsync_os2.c
index 96ce1656a68..de23ea104b2 100644
--- a/src/osd/sdl/sdlsync_os2.c
+++ b/src/osd/sdl/sdlsync_os2.c
@@ -33,7 +33,7 @@
#define pthread_t int
#define pthread_self _gettid
-struct _osd_lock {
+struct osd_lock {
volatile pthread_t holder;
INT32 count;
#ifdef PTR64
@@ -43,7 +43,7 @@ struct _osd_lock {
#endif
};
-struct _osd_event {
+struct osd_event {
HMTX hmtx;
HEV hev;
volatile INT32 autoreset;
@@ -54,13 +54,13 @@ struct _osd_event {
// TYPE DEFINITIONS
//============================================================
-struct _osd_thread {
+struct osd_thread {
pthread_t thread;
osd_thread_callback callback;
void *param;
};
-struct _osd_scalable_lock
+struct osd_scalable_lock
{
struct
{
diff --git a/src/osd/sdl/sdlsync_sdl.c b/src/osd/sdl/sdlsync_sdl.c
index 734cbcc67f0..3ee7cc41060 100644
--- a/src/osd/sdl/sdlsync_sdl.c
+++ b/src/osd/sdl/sdlsync_sdl.c
@@ -34,7 +34,7 @@ struct hidden_mutex_t {
volatile INT32 threadid;
};
-struct _osd_event {
+struct osd_event {
SDL_mutex * mutex;
SDL_cond * cond;
volatile INT32 autoreset;
@@ -45,13 +45,13 @@ struct _osd_event {
// TYPE DEFINITIONS
//============================================================
-struct _osd_thread {
+struct osd_thread {
SDL_Thread * thread;
osd_thread_callback callback;
void *param;
};
-struct _osd_scalable_lock
+struct osd_scalable_lock
{
SDL_mutex * mutex;
};
diff --git a/src/osd/sdl/sdlsync_tc.c b/src/osd/sdl/sdlsync_tc.c
index d1ad72e9bde..7d8cb7d5682 100644
--- a/src/osd/sdl/sdlsync_tc.c
+++ b/src/osd/sdl/sdlsync_tc.c
@@ -38,7 +38,7 @@ struct hidden_mutex_t {
pthread_mutex_t id;
};
-struct _osd_event {
+struct osd_event {
pthread_mutex_t mutex;
pthread_cond_t cond;
volatile INT32 autoreset;
@@ -54,11 +54,11 @@ struct _osd_event {
// TYPE DEFINITIONS
//============================================================
-struct _osd_thread {
+struct osd_thread {
pthread_t thread;
};
-struct _osd_scalable_lock
+struct osd_scalable_lock
{
osd_lock *lock;
};
diff --git a/src/osd/sdl/sdlsync_win32.c b/src/osd/sdl/sdlsync_win32.c
index 354d4c32b16..91f8c6b97e5 100644
--- a/src/osd/sdl/sdlsync_win32.c
+++ b/src/osd/sdl/sdlsync_win32.c
@@ -32,12 +32,12 @@
#define USE_SCALABLE_LOCKS (0)
-struct _osd_event
+struct osd_event
{
void * ptr;
};
-struct _osd_thread {
+struct osd_thread {
HANDLE handle;
osd_thread_callback callback;
void *param;
@@ -93,7 +93,7 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout)
// Scalable Locks
//============================================================
-struct _osd_scalable_lock
+struct osd_scalable_lock
{
#if USE_SCALABLE_LOCKS
struct
diff --git a/src/osd/sdl/sdlwork.c b/src/osd/sdl/sdlwork.c
index df9aae7efbe..fca2a0272c0 100644
--- a/src/osd/sdl/sdlwork.c
+++ b/src/osd/sdl/sdlwork.c
@@ -88,7 +88,7 @@ struct work_thread_info
};
-struct _osd_work_queue
+struct osd_work_queue
{
osd_scalable_lock * lock; // lock for protecting the queue
osd_work_item * volatile list; // list of items in the queue
@@ -112,7 +112,7 @@ struct _osd_work_queue
};
-struct _osd_work_item
+struct osd_work_item
{
osd_work_item * next; // pointer to next item
osd_work_queue * queue; // pointer back to the owning queue