Removed pragma messages as requested in #1275.

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index bcd969803ce9d874fb54a5f7f72bed1a14e48e56..515b19c3fab0242efad47b2bdc5946b4c13461d8 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -9,14 +9,14 @@
 #define Magick_Include_header
 
 #if !defined(_MAGICK_CONFIG_H)
-# define _MAGICK_CONFIG_H
-# if !defined(vms) && !defined(macintosh)
-#  include "MagickCore/magick-config.h"
-# else
-#  include "magick-config.h"
-# endif
-# undef inline // Remove possible definition from config.h
-# undef class
+#  define _MAGICK_CONFIG_H
+#  if !defined(vms) && !defined(macintosh)
+#    include "MagickCore/magick-config.h"
+#  else
+#    include "magick-config.h"
+#  endif
+#  undef inline // Remove possible definition from config.h
+#  undef class
 #endif
 
 // Needed for stdio FILE
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #if defined(__BORLANDC__)
-# include <vcl.h> /* Borland C++ Builder 4.0 requirement */
+#  include <vcl.h> /* Borland C++ Builder 4.0 requirement */
 #endif // defined(__BORLANDC__)
 
 //
@@ -51,7 +51,7 @@ namespace MagickCore
 // Borland C++Builder and MinGW builds.
 //
 #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# define MagickCplusPlusDLLSupported
+#  define MagickCplusPlusDLLSupported
 #endif
 #if defined(MagickCplusPlusDLLSupported)
 #  if defined(_MT) && defined(_DLL) && !defined(_LIB) && !defined(STATIC_MAGICK)
@@ -75,39 +75,27 @@ namespace MagickCore
 #    endif
 #    if !defined(MAGICKCORE_IMPLEMENTATION)
 #      if defined(__GNUC__)
-#       define MagickPPExport __attribute__ ((dllimport))
+#        define MagickPPExport __attribute__ ((dllimport))
 #      else
-#       define MagickPPExport __declspec(dllimport)
+#        define MagickPPExport __declspec(dllimport)
 #      endif
 #      define MagickPPPrivate extern __declspec(dllimport)
-#      if defined(_VISUALC_)
-#        pragma message( "Magick++ lib DLL import" )
-#      endif
 #    else
 #      if defined(__BORLANDC__) || defined(__MINGW32__)
 #        define MagickPPExport __declspec(dllexport)
 #        define MagickPPPrivate __declspec(dllexport)
-#        if defined(__BORLANDC__)
-#          pragma message( "BCBMagick++ lib DLL export" )
-#        endif
 #      else
 #        if defined(__GNUC__)
-#         define MagickPPExport __attribute__ ((dllexport))
+#          define MagickPPExport __attribute__ ((dllexport))
 #        else
-#         define MagickPPExport __declspec(dllexport)
+#          define MagickPPExport __declspec(dllexport)
 #        endif
 #        define MagickPPPrivate extern __declspec(dllexport)
 #      endif
-#      if defined(_VISUALC_)
-#        pragma message( "Magick++ lib DLL export" )
-#      endif
 #    endif
 #  else
 #    define MagickPPExport
 #    define MagickPPPrivate
-#    if defined(_VISUALC_)
-#      pragma message( "Magick++ lib static interface" )
-#    endif
 #    if defined(_MSC_VER) && defined(STATIC_MAGICK) && !defined(NOAUTOLINK_MAGICK)
 #      if defined(_DEBUG)
 #        if defined(MAGICKCORE_BZLIB_DELEGATE)
@@ -267,13 +255,13 @@ namespace MagickCore
 #    endif
 #  endif
 #else
-# if __GNUC__ >= 4
-#  define MagickPPExport __attribute__ ((visibility ("default")))
-#  define MagickPPPrivate  __attribute__ ((visibility ("hidden")))
-# else
-#   define MagickPPExport
-#   define MagickPPPrivate
-# endif
+#  if __GNUC__ >= 4
+#    define MagickPPExport __attribute__ ((visibility ("default")))
+#    define MagickPPPrivate  __attribute__ ((visibility ("hidden")))
+#  else
+#    define MagickPPExport
+#    define MagickPPPrivate
+#  endif
 #endif
 
 #if (defined(WIN32) || defined(WIN64)) && defined(_VISUALC_)

diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
index e1142273bab85112896b01f988ebea7dfc10a54c..35a637a6815ac2db3003e6ea22c30f054089f8f8 100644 (file)
--- a/MagickCore/method-attribute.h
+++ b/MagickCore/method-attribute.h
@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 #if defined(__BORLANDC__) && defined(_DLL)
-#  pragma message("BCBMagick lib DLL export interface")
 #  define _MAGICKDLL_
 #  define _MAGICKLIB_
 #  define MAGICKCORE_MODULES_SUPPORT
@@ -31,81 +30,64 @@ extern "C" {
 #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 */
+#  define MagickPrivate
+#  if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
+#    define _MAGICKDLL_
 #  endif
-#  if !defined(_MAGICKLIB_)
-#   if defined(__clang__) || defined(__GNUC__)
-#    define MagickExport __attribute__ ((dllimport))
-#   else
-#    define MagickExport __declspec(dllimport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "MagickCore lib DLL import interface" )
-#   endif
+#  if defined(_MAGICKDLL_)
+#    if defined(_VISUALC_)
+#      pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
+#    endif
+#    if !defined(_MAGICKLIB_)
+#      if defined(__clang__) || defined(__GNUC__)
+#        define MagickExport __attribute__ ((dllimport))
+#      else
+#        define MagickExport __declspec(dllimport)
+#      endif
+#    else
+#      if defined(__clang__) || defined(__GNUC__)
+#        define MagickExport __attribute__ ((dllexport))
+#      else
+#        define MagickExport __declspec(dllexport)
+#      endif
+#    endif
 #  else
-#   if defined(__clang__) || defined(__GNUC__)
-#    define MagickExport __attribute__ ((dllexport))
-#   else
-#    define MagickExport __declspec(dllexport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "MagickCore lib DLL export interface" )
-#   endif
+#    define MagickExport
 #  endif
-# else
-#  define MagickExport
-#  if defined(_VISUALC_)
-#   pragma message( "MagickCore lib static interface" )
-#  endif
-# endif
-
-# if defined(_DLL) && !defined(_LIB)
-#   if defined(__clang__) || defined(__GNUC__)
-#    define ModuleExport __attribute__ ((dllexport))
-#   else
-#    define ModuleExport __declspec(dllexport)
-#   endif
-#  if defined(_VISUALC_)
-#   pragma message( "MagickCore module DLL export interface" )
+#  if defined(_DLL) && !defined(_LIB)
+#    if defined(__clang__) || defined(__GNUC__)
+#      define ModuleExport __attribute__ ((dllexport))
+#    else
+#      define ModuleExport __declspec(dllexport)
+#    endif
+#  else
+#    define ModuleExport
 #  endif
-# else
-#  define ModuleExport
 #  if defined(_VISUALC_)
-#   pragma message( "MagickCore module static interface" )
+#    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
-
-# endif
-# 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 defined(__clang__) || (__GNUC__ >= 4)
-#  define MagickExport __attribute__ ((visibility ("default")))
-#  define MagickPrivate  __attribute__ ((visibility ("hidden")))
-# else
-#   define MagickExport
-#   define MagickPrivate
-# endif
-# define ModuleExport  MagickExport
+#  if defined(__clang__) || (__GNUC__ >= 4)
+#    define MagickExport __attribute__ ((visibility ("default")))
+#    define MagickPrivate  __attribute__ ((visibility ("hidden")))
+#  else
+#    define MagickExport
+#    define MagickPrivate
+#  endif
+#  define ModuleExport  MagickExport
 #endif
 
 #define MagickCoreSignature  0xabacadabUL
 #if !defined(MagickPathExtent)
-# define MagickPathExtent  4096  /* always >= 4096 */
+#  define MagickPathExtent  4096  /* always >= 4096 */
 #endif
-# define MaxTextExtent  MagickPathExtent
+#define MaxTextExtent  MagickPathExtent
 
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
 #  define magick_aligned(x,y)  x __attribute__((aligned(y)))

diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h
index 5e0d5cafa246bc27cb80f33f91cf5d38ad91ecd4..de509d65b810f5cdf873e6fbdb2861a29405f1fb 100644 (file)
--- a/MagickWand/method-attribute.h
+++ b/MagickWand/method-attribute.h
@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 #if defined(__BORLANDC__) && defined(_DLL)
-#  pragma message("BCBMagick lib DLL export interface")
 #  define _MAGICKDLL_
 #  define _MAGICKLIB_
 #  define MAGICKCORE_MODULES_SUPPORT
@@ -31,72 +30,52 @@ extern "C" {
 #endif
 
 #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 */
+#  define WandPrivate
+#  if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
+#    define _MAGICKDLL_
 #  endif
-#  if !defined(_MAGICKLIB_)
-#   if defined(__clang__) || defined(__GNUC__)
-#    define WandExport __attribute__ ((dllimport))
-#   else
-#    define WandExport __declspec(dllimport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "MagickCore lib DLL import interface" )
-#   endif
+#  if defined(_MAGICKDLL_)
+#    if defined(_VISUALC_)
+#      pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
+#    endif
+#    if !defined(_MAGICKLIB_)
+#      if defined(__clang__) || defined(__GNUC__)
+#        define WandExport __attribute__ ((dllimport))
+#      else
+#        define WandExport __declspec(dllimport)
+#      endif
+#    else
+#      if defined(__clang__) || defined(__GNUC__)
+#        define WandExport __attribute__ ((dllexport))
+#      else
+#        define WandExport __declspec(dllexport)
+#      endif
+#    endif
 #  else
-#   if defined(__clang__) || defined(__GNUC__)
-#    define WandExport __attribute__ ((dllexport))
-#   else
-#    define WandExport __declspec(dllexport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "MagickCore lib DLL export interface" )
-#   endif
-#  endif
-# else
-#  define WandExport
-#  if defined(_VISUALC_)
-#   pragma message( "MagickCore lib static interface" )
-#  endif
-# endif
-
-# if defined(_DLL) && !defined(_LIB)
-#  if defined(_VISUALC_)
-#   pragma message( "MagickCore module DLL export interface" )
+#    define WandExport
 #  endif
-# else
 #  if defined(_VISUALC_)
-#   pragma message( "MagickCore module static interface" )
+#    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
-
-# endif
-# 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 defined(__clang__) || (__GNUC__ >= 4)
-#  define WandExport __attribute__ ((visibility ("default")))
-#  define WandPrivate  __attribute__ ((visibility ("hidden")))
-# else
-#   define WandExport
-#   define WandPrivate
-# endif
+#  if defined(__clang__) || (__GNUC__ >= 4)
+#    define WandExport __attribute__ ((visibility ("default")))
+#    define WandPrivate  __attribute__ ((visibility ("hidden")))
+#  else
+#    define WandExport
+#    define WandPrivate
+#  endif
 #endif
 
 #define MagickWandSignature  0xabacadabUL
 #if !defined(MagickPathExtent)
-# define MagickPathExtent  4096
+#  define MagickPathExtent  4096
 #endif
 
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)