walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Catch case where we use the Unix code on a non-Unix system that lacks pthreads. 

Thanks, Patrice!
This commit is contained in:
Ryan C. Gordon 2010-02-03 23:14:11 -05:00
parent 6d6fec87ad
commit 5a98fc83a8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -191,8 +191,6 @@ IF(UNIX)
CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H) CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H)
IF(HAVE_PTHREAD_H) IF(HAVE_PTHREAD_H)
SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE) SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE)
ELSE(HAVE_PTHREAD_H)
ADD_DEFINITIONS(-DPHYSFS_NO_PTHREADS_SUPPORT=1)
ENDIF(HAVE_PTHREAD_H) ENDIF(HAVE_PTHREAD_H)
ENDIF(BEOS) ENDIF(BEOS)
ENDIF(UNIX) ENDIF(UNIX)
@ -216,6 +214,7 @@ ENDIF(NOT PHYSFS_HAVE_CDROM_SUPPORT)
IF(PHYSFS_HAVE_THREAD_SUPPORT) IF(PHYSFS_HAVE_THREAD_SUPPORT)
ADD_DEFINITIONS(-D_REENTRANT -D_THREAD_SAFE) ADD_DEFINITIONS(-D_REENTRANT -D_THREAD_SAFE)
ELSE(PHYSFS_HAVE_THREAD_SUPPORT) ELSE(PHYSFS_HAVE_THREAD_SUPPORT)
ADD_DEFINITIONS(-DPHYSFS_NO_THREAD_SUPPORT=1)
MESSAGE(WARNING " ***") MESSAGE(WARNING " ***")
MESSAGE(WARNING " *** There is no thread support in this build!") MESSAGE(WARNING " *** There is no thread support in this build!")
MESSAGE(WARNING " *** PhysicsFS will NOT be reentrant!") MESSAGE(WARNING " *** PhysicsFS will NOT be reentrant!")

6
src/platform_unix.c
View File

@ -24,7 +24,7 @@
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#if (!defined PHYSFS_NO_PTHREADS_SUPPORT) #if (!defined PHYSFS_NO_THREAD_SUPPORT)
#include <pthread.h> #include <pthread.h>
#endif #endif
@ -345,7 +345,7 @@ int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
} /* __PHYSFS_platformSetDefaultAllocator */ } /* __PHYSFS_platformSetDefaultAllocator */
#if (defined PHYSFS_NO_PTHREADS_SUPPORT) #if (defined PHYSFS_NO_THREAD_SUPPORT)
void *__PHYSFS_platformGetThreadID(void) { return ((void *) 0x0001); } void *__PHYSFS_platformGetThreadID(void) { return ((void *) 0x0001); }
void *__PHYSFS_platformCreateMutex(void) { return ((void *) 0x0001); } void *__PHYSFS_platformCreateMutex(void) { return ((void *) 0x0001); }
@ -429,7 +429,7 @@ void __PHYSFS_platformReleaseMutex(void *mutex)
} /* if */ } /* if */
} /* __PHYSFS_platformReleaseMutex */ } /* __PHYSFS_platformReleaseMutex */
#endif /* !PHYSFS_NO_PTHREADS_SUPPORT */ #endif /* !PHYSFS_NO_THREAD_SUPPORT */
#endif /* PHYSFS_PLATFORM_UNIX */ #endif /* PHYSFS_PLATFORM_UNIX */