From: cristy Date: Mon, 10 Dec 2012 13:18:45 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4633 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=277f3a2cffba1a5797dc0bead445b7c6166a02f4;p=imagemagick --- diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index 7af07ae71..a401daf14 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -28,7 +28,7 @@ extern "C" { #define MAGICKCORE_QUANTUM_DEPTH 16 #endif -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__) && !defined(__MINGW64__) # define MagickLLConstant(c) (MagickOffsetType) (c ## i64) # define MagickULLConstant(c) (MagickSizeType) (c ## ui64) #else diff --git a/MagickCore/magick.c b/MagickCore/magick.c index 553ee07f5..7db4a4757 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -1243,7 +1243,7 @@ MagickExport void MagickCoreGenesis(const char *path, events=DestroyString(events); } #if defined(MAGICKCORE_WINDOWS_SUPPORT) -#if defined(_DEBUG) && !defined(__BORLANDC__) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__) && !defined(__MINGW64__) if (IsEventLogging() != MagickFalse) { int diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index 0d9950808..8c8c1217f 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -39,7 +39,7 @@ extern "C" { #include #include #include -#if defined(_DEBUG) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if defined(_DEBUG) && !defined(__MINGW32__) && !defined(__MINGW64__) #include #endif @@ -97,7 +97,7 @@ extern "C" { #if !defined(fileno) # define fileno _fileno #endif -#if !defined(fseek) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if !defined(fseek) && !defined(__MINGW32__) && !defined(__MINGW64__) #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800) # define fseek _fseeki64 @@ -114,7 +114,7 @@ extern "C" { #if !defined(fsync) # define fsync _commit #endif -#if !defined(ftell) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if !defined(ftell) && !defined(__MINGW32__) && !defined(__MINGW64__) #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800) # define ftell _ftelli64 @@ -328,7 +328,7 @@ typedef struct _NTMEMORYSTATUSEX ullAvailExtendedVirtual; } NTMEMORYSTATUSEX; -#if \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if !defined(__MINGW32__) && !defined(__MINGW64__) struct timezone { int @@ -372,7 +372,7 @@ extern MagickPrivate double extern MagickPrivate int Exit(int), -#if \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if !defined(__MINGW32__) && !defined(__MINGW64__) gettimeofday(struct timeval *,struct timezone *), #endif IsWindows95(void), diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 268b8d6b0..a68423623 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -241,7 +241,7 @@ MagickPrivate int Exit(int status) return(0); } -#if \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if !defined(__MINGW32__) && !defined(__MINGW64__) /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h index 0a9c6dc25..ed2a953fa 100644 --- a/MagickCore/utility-private.h +++ b/MagickCore/utility-private.h @@ -105,7 +105,7 @@ static inline FILE *fopen_utf8(const char *path,const char *mode) #endif } -#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && \!defined(__MINGW32__) && \!defined(__MINGW64__) +#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__) typedef int mode_t; #endif