Commit f8d3f5e32 for imagemagick.org
commit f8d3f5e32a66971806546e86c495b010b74bde54
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sat Sep 5 09:51:11 2026 +0200
Fixed the windows build by reverting some of the changes.
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index e95451824..9fbf8282f 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -21,11 +21,6 @@
# undef class
#endif
-#include <string.h>
-#include <stddef.h>
-#include <cstring>
-#include <cstddef>
-
// Needed for stdio FILE
#include <stdio.h>
#include <stdarg.h>
diff --git a/MagickCore/delegate-private.h b/MagickCore/delegate-private.h
index 2f4c53b41..7ca393119 100644
--- a/MagickCore/delegate-private.h
+++ b/MagickCore/delegate-private.h
@@ -18,8 +18,6 @@
#ifndef MAGICKCORE_DELEGATE_PRIVATE_H
#define MAGICKCORE_DELEGATE_PRIVATE_H
-#include <string.h>
-#include <stddef.h>
#include "MagickCore/locale_.h"
#include "MagickCore/string_.h"
diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index d2e2a09c1..94bcccdae 100644
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -19,9 +19,6 @@
#define MAGICKCORE_IMAGE_PRIVATE_H
#include <limits.h>
-#include <sys/types.h>
-#include "MagickCore/nt-base.h"
-#include "MagickCore/nt-base-private.h"
#include "MagickCore/pixel-accessor.h"
#include "MagickCore/quantum-private.h"
diff --git a/MagickCore/memory_.h b/MagickCore/memory_.h
index 24ebf6ffa..86c5a8f4e 100644
--- a/MagickCore/memory_.h
+++ b/MagickCore/memory_.h
@@ -20,6 +20,16 @@
#include <errno.h>
+#ifdef _WIN64
+# if !defined(SSIZE_MAX)
+# define SSIZE_MAX LLONG_MAX
+# endif
+#else
+# if !defined(SSIZE_MAX)
+# define SSIZE_MAX LONG_MAX
+# endif
+#endif
+
#define MAGICK_INT_MAX (INT_MAX)
#define MAGICK_PTRDIFF_MAX (PTRDIFF_MAX)
#define MAGICK_PTRDIFF_MIN (-PTRDIFF_MAX-1)
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 7fcf203be..2d314f5dd 100644
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -57,15 +57,6 @@ extern "C" {
#define _SC_PAGE_SIZE 1
#define _SC_PHYS_PAGES 2
#define _SC_OPEN_MAX 3
-#ifdef _WIN64
-# if !defined(SSIZE_MAX)
-# define SSIZE_MAX LLONG_MAX
-# endif
-#else
-# if !defined(SSIZE_MAX)
-# define SSIZE_MAX LONG_MAX
-# endif
-#endif
#ifndef S_ISCHR
# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
#endif