From 181a2edb53718301e3bce7f3ea65e5662d0c2c46 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 18 Feb 2012 22:55:00 +0000 Subject: [PATCH] --- MagickCore/MagickCore.h | 8 +++ MagickCore/studio.h | 110 +--------------------------------------- MagickWand/MagickWand.h | 6 +++ MagickWand/studio.h | 103 +------------------------------------ 4 files changed, 18 insertions(+), 209 deletions(-) diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index 751e71a9e..2e3376e68 100644 --- a/MagickCore/MagickCore.h +++ b/MagickCore/MagickCore.h @@ -55,6 +55,14 @@ extern "C" { # define MAGICKCORE_POSIX_SUPPORT #endif +#if defined(__BORLANDC__) && defined(_DLL) +# pragma message("BCBMagick lib DLL export interface") +# define _MAGICKDLL_ +# define _MAGICKLIB_ +# define MAGICKCORE_MODULES_SUPPORT +# undef MAGICKCORE_BUILD_MODULES +#endif + #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) # define MagickPrivate # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK) diff --git a/MagickCore/studio.h b/MagickCore/studio.h index 526486338..3c3c86551 100644 --- a/MagickCore/studio.h +++ b/MagickCore/studio.h @@ -62,92 +62,6 @@ extern "C" { # define STDC #endif -#if defined(__BORLANDC__) && defined(_DLL) -# pragma message("BCBMagick lib DLL export interface") -# define _MAGICKDLL_ -# define _MAGICKLIB_ -# define MAGICKCORE_MODULES_SUPPORT -# undef MAGICKCORE_BUILD_MODULES -#endif - -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) -# define MagickPrivate -# 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 MagickExport __attribute__ ((__dllimport__)) -# else -# define MagickExport __declspec(dllimport) -# endif -# if defined(_VISUALC_) -# pragma message( "MagickCore lib DLL import interface" ) -# endif -# else -# if defined(__GNUC__) -# define MagickExport __attribute__ ((__dllexport__)) -# else -# define MagickExport __declspec(dllexport) -# endif -# if defined(_VISUALC_) -# pragma message( "MagickCore lib DLL export interface" ) -# endif -# endif -# else -# define MagickExport -# if defined(_VISUALC_) -# pragma message( "MagickCore lib static interface" ) -# endif -# endif - -# if defined(_DLL) && !defined(_LIB) -# if defined(__GNUC__) -# define ModuleExport __attribute__ ((__dllexport__)) -# else -# define ModuleExport __declspec(dllexport) -# endif -# if defined(_VISUALC_) -# pragma message( "MagickCore module DLL export interface" ) -# endif -# else -# define ModuleExport -# if defined(_VISUALC_) -# pragma message( "MagickCore module static interface" ) -# endif - -# endif -# define MagickGlobal __declspec(thread) -# if defined(_VISUALC_) -# pragma warning(disable : 4018) -# pragma warning(disable : 4068) -# 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 MagickExport __attribute__ ((__visibility__ ("default"))) -# define MagickPrivate __attribute__ ((__visibility__ ("hidden"))) -# else -# define MagickExport -# define MagickPrivate -# endif -# define ModuleExport MagickExport -# define MagickGlobal -#endif - -#define MagickSignature 0xabacadabUL -#if !defined(MaxTextExtent) -# define MaxTextExtent 4096 -#endif - #include #include #if defined(MAGICKCORE_HAVE_SYS_STAT_H) @@ -246,28 +160,6 @@ extern size_t strlcpy(char *,const char *,size_t); extern int vsnprintf(char *,size_t,const char *,va_list); #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__)) -#else -# define magick_aligned(x) /* nothing */ -# define magick_attribute(x) /* nothing */ -# define magick_unused(x) x -#endif - -#if defined(MAGICKCORE_HAVE___ALLOC_SIZE__) -# define magick_alloc_size(x) __attribute__((__alloc_size__(x))) -# define magick_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) -# define magick_cold __attribute__((__cold__)) -# define magick_hot __attribute__((__hot__)) -#else -# define magick_alloc_size(x) /* nothing */ -# define magick_alloc_sizes(x,y) /* nothing */ -# define magick_cold -# define magick_hot -#endif - #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) # include # include @@ -341,6 +233,8 @@ extern int vsnprintf(char *,size_t,const char *,va_list); # include "MagickCore/vms.h" #endif +#include "MagickCore/MagickCore.h" + #undef HAVE_CONFIG_H #undef gamma #undef index diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h index bfeca5f13..818e05016 100644 --- a/MagickWand/MagickWand.h +++ b/MagickWand/MagickWand.h @@ -55,6 +55,12 @@ extern "C" { # define MAGICKCORE_POSIX_SUPPORT #endif +#if defined(__BORLANDC__) && defined(_DLL) +# pragma message("BCBMagick lib DLL export interface") +# define _MAGICKDLL_ +# define _MAGICKLIB_ +#endif + #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) # define WandPrivate # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) diff --git a/MagickWand/studio.h b/MagickWand/studio.h index ab0c3424f..72f17e0a7 100644 --- a/MagickWand/studio.h +++ b/MagickWand/studio.h @@ -58,91 +58,12 @@ extern "C" { # define STDC #endif -#if defined(__BORLANDC__) && defined(_DLL) -# pragma message("BCBMagick lib DLL export interface") -# define _MAGICKDLL_ -# define _MAGICKLIB_ -#endif - -#if defined(MAGICKCORE_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 - -# if defined(_DLL) && !defined(_LIB) -# define ModuleExport __declspec(dllexport) -# if defined(_VISUALC_) -# pragma message( "MagickWand module DLL export interface" ) -# endif -# else -# define ModuleExport -# if defined(_VISUALC_) -# pragma message( "MagickWand module static interface" ) -# endif - -# endif -# define WandGlobal __declspec(thread) -# if defined(_VISUALC_) -# pragma warning(disable : 4018) -# pragma warning(disable : 4068) -# 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(__cplusplus) || defined(c_plusplus) # define storage_class c_class #else # define storage_class class #endif -#define WandSignature 0xabacadabUL -#if !defined(MaxTextExtent) -# define MaxTextExtent 4096 -#endif - #include #include #if defined(MAGICKCORE_HAVE_SYS_STAT_H) @@ -251,28 +172,6 @@ extern size_t strlcpy(char *,const char *,size_t); extern int vsnprintf(char *,size_t,const char *,va_list); #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 - #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) # include # include @@ -346,6 +245,8 @@ extern int vsnprintf(char *,size_t,const char *,va_list); # include "MagickCore/vms.h" #endif +#include "MagickWand/MagickWand.h" + #undef HAVE_CONFIG_H #undef gamma #undef index -- 2.40.0