]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 10 Jan 2013 00:24:33 +0000 (00:24 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 10 Jan 2013 00:24:33 +0000 (00:24 +0000)
MagickCore/cache.c
MagickCore/distribute-cache.c

index 0a44b11a61b1ef626411b07439bd8c3d5e4cd0f7..b9f94cb8f2488c63729e1c9c026a815e0a2aaf6e 100644 (file)
 #include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
-#if defined(MAGICKCORE_HAVE_SOCKET)
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
 #include "zlib.h"
 #endif
index 245f72f1e6980ae49d0bac4cd933361be0f981b5..0d713c59f20f5e354e71ef0b28417ece85889a5f 100644 (file)
@@ -57,7 +57,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/memory_.h"
-#if defined(MAGICKCORE_HAVE_SOCKET)
+#if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_HAVE_PTHREAD)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -156,7 +156,7 @@ MagickPrivate DistributeCacheInfo *DestroyDistributeCacheInfo(
 */
 MagickExport void PixelCacheServer(const size_t port)
 {
-#if defined(MAGICKCORE_HAVE_SOCKET)
+#if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_HAVE_PTHREAD)
   char
     buffer[MaxTextExtent];