pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compile error

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401637
This commit is contained in:
Sam Lantinga 2006-04-13 14:27:58 +00:00
parent 9568645775
commit 1f2f61915e
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/thread/pthread/SDL_syssem.c
View file

@ -35,7 +35,7 @@
#else #else
struct SDL_semaphore { struct SDL_semaphore {
sem_t *sem; sem_t sem;
}; };
/* Create a semaphore, initialized with value */ /* Create a semaphore, initialized with value */
@ -43,12 +43,10 @@ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
{ {
SDL_sem *sem = (SDL_sem *) SDL_malloc(sizeof(SDL_sem)); SDL_sem *sem = (SDL_sem *) SDL_malloc(sizeof(SDL_sem));
if ( sem ) { if ( sem ) {
if ( sem_init(&sem->sem_data, 0, initial_value) < 0 ) { if ( sem_init(&sem->sem, 0, initial_value) < 0 ) {
SDL_SetError("sem_init() failed"); SDL_SetError("sem_init() failed");
SDL_free(sem); SDL_free(sem);
sem = NULL; sem = NULL;
} else {
sem->sem = &sem->sem_data;
} }
} else { } else {
SDL_OutOfMemory(); SDL_OutOfMemory();
@ -59,7 +57,7 @@ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
void SDL_DestroySemaphore(SDL_sem *sem) void SDL_DestroySemaphore(SDL_sem *sem)
{ {
if ( sem ) { if ( sem ) {
sem_destroy(sem->sem); sem_destroy(&sem->sem);
SDL_free(sem); SDL_free(sem);
} }
} }
@ -73,7 +71,7 @@ int SDL_SemTryWait(SDL_sem *sem)
return -1; return -1;
} }
retval = SDL_MUTEX_TIMEDOUT; retval = SDL_MUTEX_TIMEDOUT;
if ( sem_trywait(sem->sem) == 0 ) { if ( sem_trywait(&sem->sem) == 0 ) {
retval = 0; retval = 0;
} }
return retval; return retval;
@ -88,7 +86,7 @@ int SDL_SemWait(SDL_sem *sem)
return -1; return -1;
} }
retval = sem_wait(sem->sem); retval = sem_wait(&sem->sem);
if ( retval < 0 ) { if ( retval < 0 ) {
SDL_SetError("sem_wait() failed"); SDL_SetError("sem_wait() failed");
} }
@ -130,7 +128,7 @@ Uint32 SDL_SemValue(SDL_sem *sem)
{ {
int ret = 0; int ret = 0;
if ( sem ) { if ( sem ) {
sem_getvalue(sem->sem, &ret); sem_getvalue(&sem->sem, &ret);
if ( ret < 0 ) { if ( ret < 0 ) {
ret = 0; ret = 0;
} }
@ -147,7 +145,7 @@ int SDL_SemPost(SDL_sem *sem)
return -1; return -1;
} }
retval = sem_post(sem->sem); retval = sem_post(&sem->sem);
if ( retval < 0 ) { if ( retval < 0 ) {
SDL_SetError("sem_post() failed"); SDL_SetError("sem_post() failed");
} }