From: cristy Date: Wed, 3 Apr 2013 00:40:44 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3963 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87110814eab0e8cdaab78023d7e54427da8dc267;p=imagemagick --- diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h index 0c61248c1..a4c7558c2 100644 --- a/MagickWand/MagickWand.h +++ b/MagickWand/MagickWand.h @@ -64,94 +64,10 @@ extern "C" { # define MAGICKWAND_POSIX_SUPPORT #endif -#if defined(__BORLANDC__) && defined(_DLL) -# pragma message("BCBMagick lib DLL export interface") -# define _MAGICKDLL_ -# define _MAGICKLIB_ -#endif - -#include "MagickWand/method-attribute.h" - -#if defined(MAGICKWAND_WINDOWS_SUPPORT) && !defined(__CYGWIN__) -# define WandPrivate -# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) -# define _MAGICKDLL_ -# endif -# if defined(_MAGICKDLL_) -# if defined(_VISUALC_) -# pragma warning( disable: 4273 ) /* Disable the dll linkage warnings */ -# endif -# if !defined(_MAGICKLIB_) -# if defined(__GNUC__) -# define WandExport __attribute__ ((__dllimport__)) -# else -# define WandExport __declspec(dllimport) -# endif -# if defined(_VISUALC_) -# pragma message( "MagickWand lib DLL import interface" ) -# endif -# else -# if defined(__GNUC__) -# define WandExport __attribute__ ((__dllexport__)) -# else -# define WandExport __declspec(dllexport) -# endif -# if defined(_VISUALC_) -# pragma message( "MagickWand lib DLL export interface" ) -# endif -# endif -# else -# define WandExport -# if defined(_VISUALC_) -# pragma message( "MagickWand lib static interface" ) -# endif -# endif - -# define WandGlobal __declspec(thread) -# if defined(_VISUALC_) -# pragma warning(disable : 4018) -# pragma warning(disable : 4244) -# pragma warning(disable : 4142) -# pragma warning(disable : 4800) -# pragma warning(disable : 4786) -# pragma warning(disable : 4996) -# endif -#else -# if __GNUC__ >= 4 -# define WandExport __attribute__ ((__visibility__ ("default"))) -# define WandPrivate __attribute__ ((__visibility__ ("hidden"))) -# else -# define WandExport -# define WandPrivate -# endif -# define WandGlobal -#endif - -#if defined(MAGICKCORE_HAVE___ATTRIBUTE__) -# define wand_aligned(x) __attribute__((__aligned__(x))) -# define wand_attribute __attribute__ -# define wand_unused(x) wand_unused_ ## x __attribute__((__unused__)) -#else -# define wand_aligned(x) /* nothing */ -# define wand_attribute(x) /* nothing */ -# define wand_unused(x) x -#endif - -#if defined(MAGICKCORE_HAVE___ALLOC_SIZE__) -# define wand_alloc_size(x) __attribute__((__alloc_size__(x))) -# define wand_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) -# define wand_cold __attribute__((__cold__)) -# define wand_hot __attribute__((__hot__)) -#else -# define wand_alloc_size(x) /* nothing */ -# define wand_alloc_sizes(x,y) /* nothing */ -# define wand_cold -# define wand_hot -#endif - typedef struct _MagickWand MagickWand; +#include "MagickWand/method-attribute.h" #include "MagickCore/MagickCore.h" #include "MagickWand/animate.h" #include "MagickWand/compare.h" diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h index b69e6c748..367159a3f 100644 --- a/MagickWand/method-attribute.h +++ b/MagickWand/method-attribute.h @@ -30,8 +30,8 @@ extern "C" { # undef MAGICKCORE_BUILD_MODULES #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) -# define MagickPrivate +#if defined(MAGICKWAND_WINDOWS_SUPPORT) && !defined(__CYGWIN__) +# define WandPrivate # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) # define _MAGICKDLL_ # endif @@ -41,25 +41,25 @@ extern "C" { # endif # if !defined(_MAGICKLIB_) # if defined(__GNUC__) -# define MagickExport __attribute__ ((dllimport)) +# define WandExport __attribute__ ((dllimport)) # else -# define MagickExport __declspec(dllimport) +# define WandExport __declspec(dllimport) # endif # if defined(_VISUALC_) # pragma message( "MagickCore lib DLL import interface" ) # endif # else # if defined(__GNUC__) -# define MagickExport __attribute__ ((dllexport)) +# define WandExport __attribute__ ((dllexport)) # else -# define MagickExport __declspec(dllexport) +# define WandExport __declspec(dllexport) # endif # if defined(_VISUALC_) # pragma message( "MagickCore lib DLL export interface" ) # endif # endif # else -# define MagickExport +# define WandExport # if defined(_VISUALC_) # pragma message( "MagickCore lib static interface" ) # endif @@ -87,11 +87,11 @@ extern "C" { # endif #else # if __GNUC__ >= 4 -# define MagickExport __attribute__ ((visibility ("default"))) -# define MagickPrivate __attribute__ ((visibility ("hidden"))) +# define WandExport __attribute__ ((visibility ("default"))) +# define WandPrivate __attribute__ ((visibility ("hidden"))) # else -# define MagickExport -# define MagickPrivate +# define WandExport +# define WandPrivate # endif # define MagickGlobal #endif @@ -102,25 +102,25 @@ extern "C" { #endif #if defined(MAGICKCORE_HAVE___ATTRIBUTE__) -# define magick_aligned(x) __attribute__((aligned(x))) -# define magick_attribute __attribute__ -# define magick_unused(x) magick_unused_ ## x __attribute__((unused)) +# define wand_aligned(x) __attribute__((aligned(x))) +# define wand_attribute __attribute__ +# define wand_unused(x) wand_unused_ ## x __attribute__((unused)) #else -# define magick_aligned(x) __declspec(align(x)) -# define magick_attribute(x) /* nothing */ -# define magick_unused(x) x +# define wand_aligned(x) __declspec(align(x)) +# define wand_attribute(x) /* nothing */ +# define wand_unused(x) x #endif #if (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -# define magick_alloc_size(x) __attribute__((__alloc_size__(x))) -# define magick_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) -# define magick_cold_spot __attribute__((__cold__)) -# define magick_hot_spot __attribute__((__hot__)) +# define wand_alloc_size(x) __attribute__((__alloc_size__(x))) +# define wand_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) +# define wand_cold_spot __attribute__((__cold__)) +# define wand_hot_spot __attribute__((__hot__)) #else -# define magick_alloc_size(x) /* nothing */ -# define magick_alloc_sizes(x,y) /* nothing */ -# define magick_cold_spot -# define magick_hot_spot +# define wand_alloc_size(x) /* nothing */ +# define wand_alloc_sizes(x,y) /* nothing */ +# define wand_cold_spot +# define wand_hot_spot #endif #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickWand/studio.h b/MagickWand/studio.h index 9a4d3cf1e..fd8c2ced4 100644 --- a/MagickWand/studio.h +++ b/MagickWand/studio.h @@ -23,9 +23,9 @@ extern "C" { #endif #if defined(WIN32) || defined(WIN64) -# define MAGICKCORE_WINDOWS_SUPPORT +# define MAGICKWAND_WINDOWS_SUPPORT #else -# define MAGICKCORE_POSIX_SUPPORT +# define MAGICKWAND_POSIX_SUPPORT #endif #define MAGICKWAND_IMPLEMENTATION 1 @@ -95,14 +95,14 @@ extern "C" { #if defined(MAGICKCORE_HAVE_UNISTD_H) # include #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && defined(_DEBUG) +#if defined(MAGICKWAND_WINDOWS_SUPPORT) && defined(_DEBUG) #define _CRTDBG_MAP_ALLOC #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && defined(_DEBUG) +#if defined(MAGICKWAND_WINDOWS_SUPPORT) && defined(_DEBUG) #define _CRTDBG_MAP_ALLOC #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) +#if defined(MAGICKWAND_WINDOWS_SUPPORT) # include # include # if !defined(MAGICKCORE_HAVE_STRERROR) @@ -125,7 +125,7 @@ extern "C" { #endif #if defined(MAGICKCORE_THREAD_SUPPORT) # include -#elif defined(MAGICKCORE_WINDOWS_SUPPORT) +#elif defined(MAGICKWAND_WINDOWS_SUPPORT) # define MAGICKCORE_HAVE_WINTHREADS 1 #include #endif @@ -169,13 +169,13 @@ extern int vsnprintf(char *,size_t,const char *,va_list); #include "MagickWand/method-attribute.h" -#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) +#if defined(MAGICKWAND_WINDOWS_SUPPORT) || defined(MAGICKWAND_POSIX_SUPPORT) # include # include # if defined(MAGICKCORE_HAVE_FTIME) # include # endif -# if defined(MAGICKCORE_POSIX_SUPPORT) +# if defined(MAGICKWAND_POSIX_SUPPORT) # if defined(MAGICKCORE_HAVE_SYS_NDIR_H) || defined(MAGICKCORE_HAVE_SYS_DIR_H) || defined(MAGICKCORE_HAVE_NDIR_H) # define dirent direct # define NAMLEN(dirent) (dirent)->d_namlen @@ -202,7 +202,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list); # define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) # endif # include "MagickWand/MagickWand.h" -# if !defined(MAGICKCORE_WINDOWS_SUPPORT) +# if !defined(MAGICKWAND_WINDOWS_SUPPORT) # include # if defined(MAGICKCORE_HAVE_SYS_TIMES_H) # include @@ -228,13 +228,13 @@ extern int vsnprintf(char *,size_t,const char *,va_list); #if defined(S_IRUSR) && defined(S_IWUSR) # define S_MODE (S_IRUSR | S_IWUSR) -#elif defined (MAGICKCORE_WINDOWS_SUPPORT) +#elif defined (MAGICKWAND_WINDOWS_SUPPORT) # define S_MODE (_S_IREAD | _S_IWRITE) #else # define S_MODE 0600 #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) +#if defined(MAGICKWAND_WINDOWS_SUPPORT) # include "MagickCore/nt-base.h" #endif #if defined(macintosh) @@ -253,7 +253,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list); /* Review these platform specific definitions. */ -#if defined(MAGICKCORE_POSIX_SUPPORT) && !defined(__OS2__) +#if defined(MAGICKWAND_POSIX_SUPPORT) && !defined(__OS2__) # define DirectorySeparator "/" # define DirectoryListSeparator ':' # define EditorOptions " -title \"Edit Image Comment\" -e vi" @@ -313,7 +313,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list); SetWarningHandler(MACWarningHandler) # endif # endif -# if defined(MAGICKCORE_WINDOWS_SUPPORT) +# if defined(MAGICKWAND_WINDOWS_SUPPORT) # define DirectorySeparator "\\" # define DirectoryListSeparator ';' # define EditorOptions ""