(no commit message)

[imagemagick] / magick / thread.c

diff --git a/magick/thread.c b/magick/thread.c
index 36c036ae4882ccdc6edf3a4db3ab81fb9726a8e2..d0515b9ac22400b81269b30c709277e97d2d3b27 100644 (file)
--- a/magick/thread.c
+++ b/magick/thread.c
@@ -16,7 +16,7 @@
 %                               March  2003                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -63,7 +63,7 @@
 */
 MagickExport MagickBooleanType MagickCreateThreadKey(MagickThreadKey *key)
 {
-#if defined(MAGICKCORE_HAVE_PTHREAD)
+#if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_key_create(key,NULL) == 0 ? MagickTrue : MagickFalse);
 #elif defined(MAGICKCORE_HAVE_WINTHREADS)
   *key=TlsAlloc();
@@ -98,7 +98,7 @@ MagickExport MagickBooleanType MagickCreateThreadKey(MagickThreadKey *key)
 */
 MagickExport MagickBooleanType MagickDeleteThreadKey(MagickThreadKey key)
 {
-#if defined(MAGICKCORE_HAVE_PTHREAD)
+#if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_key_delete(key) == 0 ? MagickTrue : MagickFalse);
 #elif defined(MAGICKCORE_HAVE_WINTHREADS)
   return(TlsFree(key) != 0 ? MagickTrue : MagickFalse);
@@ -133,7 +133,7 @@ MagickExport MagickBooleanType MagickDeleteThreadKey(MagickThreadKey key)
 */
 MagickExport void *MagickGetThreadValue(MagickThreadKey key)
 {
-#if defined(MAGICKCORE_HAVE_PTHREAD)
+#if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_getspecific(key));
 #elif defined(MAGICKCORE_HAVE_WINTHREADS)
   return(TlsGetValue(key));
@@ -170,12 +170,12 @@ MagickExport void *MagickGetThreadValue(MagickThreadKey key)
 MagickExport MagickBooleanType MagickSetThreadValue(MagickThreadKey key,
   const void *value)
 {
-#if defined(MAGICKCORE_HAVE_PTHREAD)
+#if defined(MAGICKCORE_THREAD_SUPPORT)
   return(pthread_setspecific(key,value) == 0 ? MagickTrue : MagickFalse);
 #elif defined(MAGICKCORE_HAVE_WINTHREADS)
   return(TlsSetValue(key,(void *) value) != 0 ? MagickTrue : MagickFalse);
 #else
-  *key=(unsigned long) value;
+  *key=(size_t) value;
   return(MagickTrue);
 #endif
 }