Moved magick_module define to the magick.h header file.

diff --git a/MagickCore/magick.h b/MagickCore/magick.h
index 4bfb15fde345d2560fec05094c9df6e711fa6530..3129eff92e0338fae9459bc7ba76bc7c613e1cbf 100644 (file)
--- a/MagickCore/magick.h
+++ b/MagickCore/magick.h
@@ -25,6 +25,12 @@ extern "C" {
 #include <stdarg.h>
 #include "MagickCore/semaphore.h"
 
+#if defined(__cplusplus) || defined(c_plusplus)
+# define magick_module  _module   /* reserved word in C++(20) */
+#else
+# define magick_module  module
+#endif
+
 typedef enum
 {
   UndefinedFormatType,

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 35d87f82c7a5a25e9a8b2ade0ba1d6764dffb524..06c772f0e530ac49d58031a45bb3b94dc902a9b5 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -55,12 +55,6 @@ extern "C" {
 #  define STDC
 #endif
 
-#if defined(__cplusplus) || defined(c_plusplus)
-# define magick_module  _module   /* reserved word in C++(20) */
-#else
-# define magick_module  module
-#endif
-
 #include <stdarg.h>
 #include <stdio.h>
 #if defined(MAGICKCORE_HAVE_SYS_STAT_H)