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

Removed some old Mac OS X cruft.

Browse source 
Fixes Bugzilla #64.

--ryan.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401303
This commit is contained in:
Ryan C. Gordon 2006-01-30 18:56:30 +00:00
parent a8366ab97d
commit d56868ac0a
2 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/thread/linux/SDL_syssem.c
View file

@ -61,8 +61,6 @@ static char rcsid =
#ifdef MACOSX #ifdef MACOSX
#define USE_NAMED_SEMAPHORES #define USE_NAMED_SEMAPHORES
/* Broken sem_getvalue() in MacOS X Public Beta */
#define BROKEN_SEMGETVALUE
#endif /* MACOSX */ #endif /* MACOSX */
struct SDL_semaphore { struct SDL_semaphore {
@ -70,12 +68,6 @@ struct SDL_semaphore {
#ifndef USE_NAMED_SEMAPHORES #ifndef USE_NAMED_SEMAPHORES
sem_t sem_data; sem_t sem_data;
#endif #endif
#ifdef BROKEN_SEMGETVALUE
/* This is a little hack for MacOS X -
It's not thread-safe, but it's better than nothing
*/
int sem_value;
#endif
}; };
/* Create a semaphore, initialized with value */ /* Create a semaphore, initialized with value */
@ -105,12 +97,6 @@ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
sem->sem = &sem->sem_data; sem->sem = &sem->sem_data;
} }
#endif /* USE_NAMED_SEMAPHORES */ #endif /* USE_NAMED_SEMAPHORES */
#ifdef BROKEN_SEMGETVALUE
if ( sem ) {
sem->sem_value = initial_value;
}
#endif /* BROKEN_SEMGETVALUE */
} else { } else {
SDL_OutOfMemory(); SDL_OutOfMemory();
} }
@ -139,9 +125,6 @@ int SDL_SemTryWait(SDL_sem *sem)
} }
retval = SDL_MUTEX_TIMEDOUT; retval = SDL_MUTEX_TIMEDOUT;
if ( sem_trywait(sem->sem) == 0 ) { if ( sem_trywait(sem->sem) == 0 ) {
#ifdef BROKEN_SEMGETVALUE
--sem->sem_value;
#endif
retval = 0; retval = 0;
} }
return retval; return retval;
@ -156,9 +139,6 @@ int SDL_SemWait(SDL_sem *sem)
return -1; return -1;
} }
#ifdef BROKEN_SEMGETVALUE
--sem->sem_value;
#endif
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");
@ -200,11 +180,7 @@ Uint32 SDL_SemValue(SDL_sem *sem)
{ {
int ret = 0; int ret = 0;
if ( sem ) { if ( sem ) {
#ifdef BROKEN_SEMGETVALUE
ret = sem->sem_value;
#else
sem_getvalue(sem->sem, &ret); sem_getvalue(sem->sem, &ret);
#endif
if ( ret < 0 ) { if ( ret < 0 ) {
ret = 0; ret = 0;
} }
@ -221,9 +197,6 @@ int SDL_SemPost(SDL_sem *sem)
return -1; return -1;
} }
#ifdef BROKEN_SEMGETVALUE
++sem->sem_value;
#endif
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");

4
src/thread/linux/SDL_systhread.c
View file

@ -61,13 +61,11 @@ void SDL_SYS_KillThread(SDL_Thread *thread)
#include <signal.h> #include <signal.h>
#if !defined(MACOSX) /* pthread_sigmask seems to be missing on MacOS X? */
/* List of signals to mask in the subthreads */ /* List of signals to mask in the subthreads */
static int sig_list[] = { static int sig_list[] = {
SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH, SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
SIGVTALRM, SIGPROF, 0 SIGVTALRM, SIGPROF, 0
}; };
#endif /* !MACOSX */
#ifdef SDL_USE_PTHREADS #ifdef SDL_USE_PTHREADS
@ -102,7 +100,6 @@ int SDL_SYS_CreateThread(SDL_Thread *thread, void *args)
void SDL_SYS_SetupThread(void) void SDL_SYS_SetupThread(void)
{ {
#if !defined(MACOSX) /* pthread_sigmask seems to be missing on MacOS X? */
int i; int i;
sigset_t mask; sigset_t mask;
@ -112,7 +109,6 @@ void SDL_SYS_SetupThread(void)
sigaddset(&mask, sig_list[i]); sigaddset(&mask, sig_list[i]);
} }
pthread_sigmask(SIG_BLOCK, &mask, 0); pthread_sigmask(SIG_BLOCK, &mask, 0);
#endif /* !MACOSX */
#ifdef PTHREAD_CANCEL_ASYNCHRONOUS #ifdef PTHREAD_CANCEL_ASYNCHRONOUS
/* Allow ourselves to be asynchronously cancelled */ /* Allow ourselves to be asynchronously cancelled */