Conditional compile with MAGICKCORE_WINDOWS_SUPPORT define

diff --git a/MagickCore/semaphore-private.h b/MagickCore/semaphore-private.h
index ee00b174a577c294fbd00349e0065a105378e501..f0c3186742077d3de867d559fbae737e27dabb07 100644 (file)
--- a/MagickCore/semaphore-private.h
+++ b/MagickCore/semaphore-private.h
@@ -34,7 +34,7 @@ static omp_lock_t
 #elif defined(MAGICKCORE_THREAD_SUPPORT)
 static pthread_mutex_t
   semaphore_mutex = PTHREAD_MUTEX_INITIALIZER;
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
 static LONG
   semaphore_mutex = 0;
 #else
@@ -79,7 +79,7 @@ static inline void LockMagickMutex(void)
         ThrowFatalException(ResourceLimitFatalError,"UnableToLockSemaphore");
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   while (InterlockedCompareExchange(&semaphore_mutex,1L,0L) != 0)
     Sleep(10);
 #endif
@@ -101,7 +101,7 @@ static inline void UnlockMagickMutex(void)
         ThrowFatalException(ResourceLimitFatalError,"UnableToUnlockSemaphore");
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   InterlockedExchange(&semaphore_mutex,0L);
 #endif
 }

diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index 6f6e65b0585c2f5a565b86e2ccefdf12439dcdee..17cd743c8f98e797d97e77250703dc99f7764c6c 100644 (file)
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -247,7 +247,7 @@ MagickExport SemaphoreInfo *AcquireSemaphoreInfo(void)
         _exit(1);
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   {
     int
       status;
@@ -316,7 +316,7 @@ MagickExport void LockSemaphoreInfo(SemaphoreInfo *semaphore_info)
         _exit(1);
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   EnterCriticalSection(&semaphore_info->mutex);
 #endif
 #if defined(MAGICKCORE_DEBUG)
@@ -369,7 +369,7 @@ MagickExport void RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
         _exit(1);
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   DeleteCriticalSection(&(*semaphore_info)->mutex);
 #endif
   (*semaphore_info)->signature=(~MagickCoreSignature);
@@ -476,7 +476,7 @@ MagickExport void UnlockSemaphoreInfo(SemaphoreInfo *semaphore_info)
         _exit(1);
       }
   }
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   LeaveCriticalSection(&semaphore_info->mutex);
 #endif
 }

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index e1dfe13865393760cde7e4e6fe1c493b70a3ff2a..44b0f39000d208006d05f02a5eb2e18596ef803e 100755 (executable)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -120,7 +120,7 @@ extern "C" {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 # include <pthread.h>
 #elif defined(MAGICKCORE_WINDOWS_SUPPORT)
-#  define MAGICKCORE_HAVE_WINTHREADS  1
+#  define MAGICKCORE_WINDOWS_SUPPORT  1
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>

diff --git a/MagickCore/thread.c b/MagickCore/thread.c
index 09c23ce4fd8670957f5b2ad40fc70fd9ce87a8aa..8d3a7e6c3f8c2efd71d7c39a8e7ce932cc0bf668 100644 (file)
--- a/MagickCore/thread.c
+++ b/MagickCore/thread.c
@@ -86,7 +86,7 @@ MagickExport MagickBooleanType CreateMagickThreadKey(MagickThreadKey *key,
 {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_key_create(key,destructor) == 0 ? MagickTrue : MagickFalse);
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   *key=TlsAlloc();
   return(*key != TLS_OUT_OF_INDEXES ? MagickTrue : MagickFalse);
 #else
@@ -139,7 +139,7 @@ MagickExport MagickBooleanType DeleteMagickThreadKey(MagickThreadKey key)
 {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_key_delete(key) == 0 ? MagickTrue : MagickFalse);
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   return(TlsFree(key) != 0 ? MagickTrue : MagickFalse);
 #else
   {
@@ -190,7 +190,7 @@ MagickExport void *GetMagickThreadValue(MagickThreadKey key)
 {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_getspecific(key));
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   return(TlsGetValue(key));
 #else
   {
@@ -234,7 +234,7 @@ MagickExport MagickBooleanType SetMagickThreadValue(MagickThreadKey key,
 {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_setspecific(key,value) == 0 ? MagickTrue : MagickFalse);
-#elif defined(MAGICKCORE_HAVE_WINTHREADS)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
   return(TlsSetValue(key,(void *) value) != 0 ? MagickTrue : MagickFalse);
 #else
   {

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 42162c607dc343185bcedce3c5ea099aefcc431a..7a67fad80ed125ff5f874783d04528bf6d6e191f 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -126,7 +126,7 @@ extern "C" {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 # include <pthread.h>
 #elif defined(MAGICKWAND_WINDOWS_SUPPORT)
-#  define MAGICKCORE_HAVE_WINTHREADS  1
+#  define MAGICKCORE_WINDOWS_SUPPORT  1
 #include <windows.h>
 #endif
 #if defined(MAGICKCORE_HAVE_SYS_SYSLIMITS_H)