diff options
Diffstat (limited to 'src/gos/gos_osx.h')
-rw-r--r-- | src/gos/gos_osx.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gos/gos_osx.h b/src/gos/gos_osx.h index c81f84ae..2e926525 100644 --- a/src/gos/gos_osx.h +++ b/src/gos/gos_osx.h @@ -19,12 +19,12 @@ typedef void * gThreadreturn; typedef unsigned long gDelay; typedef pthread_t gThread; typedef int gThreadpriority; -typedef gU32 gSemcount; -typedef pthread_mutex_t gfxMutex; +typedef gU32 gSemcount; +typedef pthread_mutex_t gMutex; -#define DECLARE_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void *param) -#define DECLARE_THREAD_STACK(name, sz) gU8 name[0]; -#define THREAD_RETURN(retval) return retval +#define GFX_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void *param) +#define GFX_THREAD_STACK(name, sz) gU8 name[0]; +#define gfxThreadReturn(retval) return retval #define gfxExit() exit(0) #define gfxAlloc(sz) malloc(sz) @@ -43,17 +43,17 @@ typedef pthread_mutex_t gfxMutex; #define gDelayNone 0 #define gDelayForever ((gDelay)-1) -#define MAX_SEMAPHORE_COUNT ((gSemcount)-1) -#define gThreadpriorityLow 10 -#define gThreadpriorityNormal 0 -#define gThreadpriorityHigh -10 +#define gSemMaxCount ((gSemcount)-1) +#define gThreadpriorityLow 10 +#define gThreadpriorityNormal 0 +#define gThreadpriorityHigh -10 -typedef struct gfxSem { +typedef struct gSem { pthread_mutex_t mtx; pthread_cond_t cond; gSemcount cnt; gSemcount max; -} gfxSem; +} gSem; /*===========================================================================*/ /* Function declarations. */ @@ -65,11 +65,11 @@ void gfxSleepMicroseconds(gDelay ms); gTicks gfxSystemTicks(void); void gfxSystemLock(void); void gfxSystemUnlock(void); -void gfxSemInit(gfxSem *psem, gSemcount val, gSemcount limit); -void gfxSemDestroy(gfxSem *psem); -gBool gfxSemWait(gfxSem *psem, gDelay ms); -void gfxSemSignal(gfxSem *psem); -gThread gfxThreadCreate(void *stackarea, gMemSize stacksz, gThreadpriority prio, DECLARE_THREAD_FUNCTION((*fn),p), void *param); +void gfxSemInit(gSem *psem, gSemcount val, gSemcount limit); +void gfxSemDestroy(gSem *psem); +gBool gfxSemWait(gSem *psem, gDelay ms); +void gfxSemSignal(gSem *psem); +gThread gfxThreadCreate(void *stackarea, gMemSize stacksz, gThreadpriority prio, GFX_THREAD_FUNCTION((*fn),p), void *param); gThreadreturn gfxThreadWait(gThread thread); #endif /* GFX_USE_OS_OSX */ |