Commit b5cf3d924 for imagemagick.org
commit b5cf3d924c3700f1c61461fa327b5478f5b2544c
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sat May 16 19:18:43 2026 -0400
eliminate compiler warning
diff --git a/MagickCore/distribute-cache-private.h b/MagickCore/distribute-cache-private.h
index f7e62f13a..4b602a450 100644
--- a/MagickCore/distribute-cache-private.h
+++ b/MagickCore/distribute-cache-private.h
@@ -25,17 +25,9 @@
extern "C" {
#endif
-#define SOCKET_TYPE int
-#if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_THREAD_SUPPORT)
-#define SOCKET_TYPE int
-#else
-#undef SOCKET_TYPE
-#define SOCKET_TYPE SOCKET
-#endif
-
typedef struct _DistributeCacheInfo
{
- SOCKET_TYPE
+ int
file;
uint64_t
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 250820d8d..61b7c4a27 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -200,7 +200,7 @@ static void InitializeWinsock2(MagickBooleanType use_lock)
#endif
#if !defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE)
-static SOCKET_TYPE ConnectPixelCacheServer(const char *magick_unused(hostname),
+static int ConnectPixelCacheServer(const char *magick_unused(hostname),
const int magick_unused(port),uint64_t *magick_unused(session_key),
ExceptionInfo *exception)
{
@@ -324,7 +324,7 @@ static inline uint64_t GenerateSessionKey(const char *shared_secret,
return(SIPHash24(key,nonce,length));
}
-static SOCKET_TYPE ConnectPixelCacheServer(const char *hostname,const int port,
+static int ConnectPixelCacheServer(const char *hostname,const int port,
uint64_t *session_key,ExceptionInfo *exception)
{
#if defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE)
@@ -421,7 +421,7 @@ static SOCKET_TYPE ConnectPixelCacheServer(const char *hostname,const int port,
"DistributedPixelCache","'%s': authentication failed",hostname);
return(-1);
}
- return(client_socket);
+ return((int) client_socket);
#else
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
"DelegateLibrarySupportNotBuiltIn","distributed pixel cache");