...

[imagemagick] / MagickCore / studio.h

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
old mode 100755 (executable)
new mode 100644 (file)
index d2f0fc2..08940ed
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -1,11 +1,11 @@
 /*
-  Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
 
   You may not use this file except in compliance with the License.
   obtain a copy of the License at
 
-    http://www.imagemagick.org/script/license.php
+    https://www.imagemagick.org/script/license.php
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,8 @@
 
   MagickCore private application programming interface declarations.
 */
-#ifndef _MAGICKCORE_STUDIO_H
-#define _MAGICKCORE_STUDIO_H
+#ifndef MAGICKCORE_STUDIO_H
+#define MAGICKCORE_STUDIO_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -30,8 +30,8 @@ extern "C" {
 
 #define MAGICKCORE_IMPLEMENTATION  1
 
-#if !defined(_MAGICKCORE_CONFIG_H)
-# define _MAGICKCORE_CONFIG_H
+#if !defined(MAGICKCORE_CONFIG_H)
+# define MAGICKCORE_CONFIG_H
 #include "MagickCore/magick-config.h"
 # if defined(MAGICKCORE__FILE_OFFSET_BITS) && !defined(_FILE_OFFSET_BITS)
 # define _FILE_OFFSET_BITS MAGICKCORE__FILE_OFFSET_BITS
@@ -68,8 +68,12 @@ extern "C" {
 #  include <stdlib.h>
 # endif
 #endif
-#if defined(_magickcore_restrict) && !defined(restrict)
-# define restrict  _magickcore_restrict
+#if !defined(magick_restrict)
+# if !defined(_magickcore_restrict)
+#  define magick_restrict restrict
+# else
+#  define magick_restrict _magickcore_restrict
+# endif
 #endif
 #if defined(MAGICKCORE_HAVE_STRING_H)
 # if !defined(STDC_HEADERS) && defined(MAGICKCORE_HAVE_MEMORY_H)
@@ -116,7 +120,6 @@ extern "C" {
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 # include <pthread.h>
 #elif defined(MAGICKCORE_WINDOWS_SUPPORT)
-#  define MAGICKCORE_HAVE_WINTHREADS  1
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
@@ -165,7 +168,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT)
 # include <sys/types.h>
 # include <sys/stat.h>
-# if defined(MAGICKCORE_HAVE_FTIME)
+# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H)
 # include <sys/timeb.h>
 # endif
 # if defined(MAGICKCORE_POSIX_SUPPORT)