From b45c0ce151431ea5fc31e3689a41242ba215cb17 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 3 Feb 2010 23:14:11 -0500 Subject: [PATCH] Catch case where we use the Unix code on a non-Unix system that lacks pthreads. Thanks, Patrice! (transplanted from 18ae36a7f55bcca606f7d7d5f745f4d9b95e0840) --- CMakeLists.txt | 3 +-- platform/unix.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e860ce..28df73b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,8 +162,6 @@ IF(UNIX) CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H) IF(HAVE_PTHREAD_H) SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE) - ELSE(HAVE_PTHREAD_H) - ADD_DEFINITIONS(-DPHYSFS_NO_PTHREADS_SUPPORT=1) ENDIF(HAVE_PTHREAD_H) ENDIF(BEOS) ENDIF(UNIX) @@ -187,6 +185,7 @@ ENDIF(NOT PHYSFS_HAVE_CDROM_SUPPORT) IF(PHYSFS_HAVE_THREAD_SUPPORT) ADD_DEFINITIONS(-D_REENTRANT -D_THREAD_SAFE) ELSE(PHYSFS_HAVE_THREAD_SUPPORT) + ADD_DEFINITIONS(-DPHYSFS_NO_THREAD_SUPPORT=1) MESSAGE(WARNING " ***") MESSAGE(WARNING " *** There is no thread support in this build!") MESSAGE(WARNING " *** PhysicsFS will NOT be reentrant!") diff --git a/platform/unix.c b/platform/unix.c index 7846166..4319db6 100644 --- a/platform/unix.c +++ b/platform/unix.c @@ -25,7 +25,7 @@ #include #include -#if (!defined PHYSFS_NO_PTHREADS_SUPPORT) +#if (!defined PHYSFS_NO_THREAD_SUPPORT) #include #endif @@ -329,7 +329,7 @@ int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) } /* __PHYSFS_platformSetDefaultAllocator */ -#if (defined PHYSFS_NO_PTHREADS_SUPPORT) +#if (defined PHYSFS_NO_THREAD_SUPPORT) PHYSFS_uint64 __PHYSFS_platformGetThreadID(void) { return(0x0001); } void *__PHYSFS_platformCreateMutex(void) { return((void *) 0x0001); } @@ -427,7 +427,7 @@ void __PHYSFS_platformReleaseMutex(void *mutex) } /* if */ } /* __PHYSFS_platformReleaseMutex */ -#endif /* !PHYSFS_NO_PTHREADS_SUPPORT */ +#endif /* !PHYSFS_NO_THREAD_SUPPORT */ #endif /* PHYSFS_PLATFORM_UNIX */