(no commit message)

diff --git a/magick/MagickCore.h b/magick/MagickCore.h
index 144dc33bdc4b859fc546a8fc3012a8bc4c06fdf8..e44bb6729d5b491ad1093a98d617dadf55074f8d 100644 (file)
--- a/magick/MagickCore.h
+++ b/magick/MagickCore.h
@@ -36,6 +36,9 @@ extern "C" {
 #if defined(_magickcore_inline) && !defined(inline)
 # define inline _magickcore_inline
 #endif
+#if defined(_magickcore_restrict) && !defined(restrict)
+# define restrict  _magickcore_restrict
+#endif
 # if defined(__cplusplus) || defined(c_plusplus)
 #  undef inline
 # endif

diff --git a/magick/locale.c b/magick/locale.c
index de6d3127a50799f02759970131b39be0ff7b9fbb..8ef79d82f88d18e35dcedc07bd56ebb88223811f 100644 (file)
--- a/magick/locale.c
+++ b/magick/locale.c
@@ -221,8 +221,8 @@ MagickExport LinkedListInfo *DestroyLocaleOptions(LinkedListInfo *messages)
 %
 */
 
-MagickExport ssize_t FormatLocaleFileList(FILE *file,const char *format,
-  va_list operands)
+MagickExport ssize_t FormatLocaleFileList(FILE *file,
+  const char *restrict format,va_list operands)
 {
   int
     n;
@@ -262,7 +262,8 @@ MagickExport ssize_t FormatLocaleFileList(FILE *file,const char *format,
   return((ssize_t) n);
 }
 
-MagickExport ssize_t FormatLocaleFile(FILE *file,const char *format,...)
+MagickExport ssize_t FormatLocaleFile(FILE *file,const char *restrict format,
+  ...)
 {
   ssize_t
     n;
@@ -307,8 +308,8 @@ MagickExport ssize_t FormatLocaleFile(FILE *file,const char *format,...)
 %
 */
 
-MagickExport ssize_t FormatLocaleStringList(char *string,const size_t length,
-  const char *format,va_list operands)
+MagickExport ssize_t FormatLocaleStringList(char *restrict string,
+  const size_t length,const char *restrict format,va_list operands)
 {
   int
     n;
@@ -343,8 +344,8 @@ MagickExport ssize_t FormatLocaleStringList(char *string,const size_t length,
   return((ssize_t) n);
 }
 
-MagickExport ssize_t FormatLocaleString(char *string,const size_t length,
-  const char *format,...)
+MagickExport ssize_t FormatLocaleString(char *restrict string,
+  const size_t length,const char *restrict format,...)
 {
   ssize_t
     n;
@@ -842,7 +843,8 @@ static MagickBooleanType InitializeLocaleList(ExceptionInfo *exception)
 %      referenced by sentinal.
 %
 */
-MagickExport double InterpretLocaleValue(const char *string,char **sentinal)
+MagickExport double InterpretLocaleValue(const char *restrict string,
+  char **restrict sentinal)
 {
   double
     value;

diff --git a/magick/locale_.h b/magick/locale_.h
index 199beb68cfa0f8ee2f0176ef3bf27aacc39eaf71..96a32c74a05345141d35e3ce7279e1ad40969ba2 100644 (file)
--- a/magick/locale_.h
+++ b/magick/locale_.h
@@ -53,7 +53,7 @@ extern MagickExport const LocaleInfo
   **GetLocaleInfoList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport double
-  InterpretLocaleValue(const char *,char **);
+  InterpretLocaleValue(const char *restrict,char **restrict);
 
 extern MagickExport LinkedListInfo
   *DestroyLocaleOptions(LinkedListInfo *),
@@ -64,14 +64,14 @@ extern MagickExport MagickBooleanType
   LocaleComponentGenesis(void);
 
 extern MagickExport ssize_t
-  FormatLocaleFile(FILE *,const char *,...)
+  FormatLocaleFile(FILE *,const char *restrict,...)
     magick_attribute((format (printf,2,3))),
-  FormatLocaleFileList(FILE *,const char *,va_list)
+  FormatLocaleFileList(FILE *,const char *restrict,va_list)
     magick_attribute((format (printf,2,0))),
-  FormatLocaleString(char *,const size_t,const char *,...)
+  FormatLocaleString(char *restrict,const size_t,const char *restrict,...)
     magick_attribute((format (printf,3,4))),
-  FormatLocaleStringList(char *,const size_t,const char *,va_list)
-    magick_attribute((format (printf,3,0)));
+  FormatLocaleStringList(char *restrict,const size_t,const char *restrict,
+    va_list) magick_attribute((format (printf,3,0)));
 
 extern MagickExport void
   LocaleComponentTerminus(void);

diff --git a/magick/studio.h b/magick/studio.h
index 81c5a06541d29fd3930eb5e1d78d42857a1e9548..f80c6b0f9622a9ecca428019ca7c570132e5b777 100644 (file)
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -46,12 +46,12 @@ extern "C" {
 #if defined(_magickcore_inline) && !defined(inline)
 # define inline  _magickcore_inline
 #endif
-# if defined(__cplusplus) || defined(c_plusplus)
-#  undef inline
-# endif
 #if defined(_magickcore_restrict) && !defined(restrict)
 # define restrict  _magickcore_restrict
 #endif
+# if defined(__cplusplus) || defined(c_plusplus)
+#  undef inline
+# endif
 #endif
 
 #if defined(MAGICKCORE_NAMESPACE_PREFIX)

diff --git a/wand/MagickWand.h b/wand/MagickWand.h
index 956ef4d0834ce441de3aea1d06c9c682300b7865..46afbbed7020d9ca137aa0717d3c4f7d21843f15 100644 (file)
--- a/wand/MagickWand.h
+++ b/wand/MagickWand.h
@@ -36,6 +36,9 @@ extern "C" {
 #if defined(_magickcore_inline) && !defined(inline)
 # define inline _magickcore_inline
 #endif
+#if defined(_magickcore_restrict) && !defined(restrict)
+# define restrict  _magickcore_restrict
+#endif
 # if defined(__cplusplus) || defined(c_plusplus)
 #  undef inline
 # endif

diff --git a/wand/studio.h b/wand/studio.h
index 22793b5ff29af25e40b2bd13d8d2980d13cb0c8a..e4628fe9fec72b9bec029dcac4a876538fd21152 100644 (file)
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -46,12 +46,12 @@ extern "C" {
 #if defined(_magickcore_inline) && !defined(inline)
 # define inline _magickcore_inline
 #endif
-# if defined(__cplusplus) || defined(c_plusplus)
-#  undef inline
-# endif
 #if defined(_magickcore_restrict) && !defined(restrict)
 # define restrict  _magickcore_restrict
 #endif
+# if defined(__cplusplus) || defined(c_plusplus)
+#  undef inline
+# endif
 #endif
 
 #if !defined(const)