Commit ac580dbd1 for imagemagick.org
commit ac580dbd100ca51ce3ed24f73fa0f4a64a16c240
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sun Jun 29 10:53:47 2025 -0400
omp.h uses templating; it cannot appear in a C block with c++ compiler
diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 70ec3a11e..16b252228 100644
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -18,6 +18,11 @@
#ifndef MAGICKCORE_STUDIO_H
#define MAGICKCORE_STUDIO_H
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+# include <omp.h>
+# define MAGICKCORE_OPENMP_SUPPORT 1
+#endif
+
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
@@ -153,11 +158,6 @@ extern "C" {
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-# include <omp.h>
-# define MAGICKCORE_OPENMP_SUPPORT 1
-#endif
-
#if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD
ssize_t pread(int,void *,size_t,off_t);
#endif
diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index e51c71472..b62758c8b 100644
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -18,6 +18,11 @@
#ifndef MAGICKWAND_STUDIO_H
#define MAGICKWAND_STUDIO_H
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+# include <omp.h>
+# define MAGICKCORE_OPENMP_SUPPORT 1
+#endif
+
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
@@ -137,11 +142,6 @@ extern "C" {
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-# include <omp.h>
-# define MAGICKCORE_OPENMP_SUPPORT 1
-#endif
-
#if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD
ssize_t pread(int,void *,size_t,off_t);
#endif