Skip to content

Commit 07a3cca

Browse files
author
cristy
committed
1 parent cc22d1d commit 07a3cca

26 files changed

+37
-37
lines changed

‎MagickCore/annotate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
#include "MagickCore/xwindow.h"
8080
#include "MagickCore/xwindow-private.h"
8181
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
82-
#if defined(__MINGW32__)
82+
#if defined(__MINGW32__) || defined(__MINGW64__)
8383
# undef interface
8484
#endif
8585
#if defined(MAGICKCORE_HAVE_FT2BUILD_H)

‎MagickCore/magick-type.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern "C" {
2828
#define MAGICKCORE_QUANTUM_DEPTH 16
2929
#endif
3030

31-
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
31+
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
3232
# define MagickLLConstant(c) (MagickOffsetType) (c ## i64)
3333
# define MagickULLConstant(c) (MagickSizeType) (c ## ui64)
3434
#else

‎MagickCore/magick.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ MagickExport void MagickCoreGenesis(const char *path,
12431243
events=DestroyString(events);
12441244
}
12451245
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
1246-
#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__)
1246+
#if defined(_DEBUG) && !defined(__BORLANDC__) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
12471247
if (IsEventLogging() != MagickFalse)
12481248
{
12491249
int

‎MagickCore/nt-base-private.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C" {
3939
#include <io.h>
4040
#include <process.h>
4141
#include <errno.h>
42-
#if defined(_DEBUG) && !defined(__MINGW32__)
42+
#if defined(_DEBUG) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
4343
#include <crtdbg.h>
4444
#endif
4545

@@ -97,7 +97,7 @@ extern "C" {
9797
#if !defined(fileno)
9898
# define fileno _fileno
9999
#endif
100-
#if !defined(fseek) && !defined(__MINGW32__)
100+
#if !defined(fseek) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
101101
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
102102
!(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
103103
# define fseek _fseeki64
@@ -114,7 +114,7 @@ extern "C" {
114114
#if !defined(fsync)
115115
# define fsync _commit
116116
#endif
117-
#if !defined(ftell) && !defined(__MINGW32__)
117+
#if !defined(ftell) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
118118
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
119119
!(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
120120
# define ftell _ftelli64
@@ -328,7 +328,7 @@ typedef struct _NTMEMORYSTATUSEX
328328
ullAvailExtendedVirtual;
329329
} NTMEMORYSTATUSEX;
330330

331-
#if !defined(__MINGW32__)
331+
#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
332332
struct timezone
333333
{
334334
int
@@ -372,7 +372,7 @@ extern MagickPrivate double
372372

373373
extern MagickPrivate int
374374
Exit(int),
375-
#if !defined(__MINGW32__)
375+
#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
376376
gettimeofday(struct timeval *,struct timezone *),
377377
#endif
378378
IsWindows95(void),

‎MagickCore/nt-base.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ MagickPrivate int Exit(int status)
241241
return(0);
242242
}
243243

244-
#if !defined(__MINGW32__)
244+
#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
245245
/*
246246
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
247247
% %

‎MagickCore/random.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#if defined(__VMS)
4545
#include <time.h>
4646
#endif
47-
#if defined(__MINGW32__)
47+
#if defined(__MINGW32__) || defined(__MINGW64__)
4848
#include <sys/time.h>
4949
#endif
5050
#include "MagickCore/studio.h"

‎MagickCore/utility-private.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern MagickPrivate void
4747

4848
static inline int access_utf8(const char *path,int mode)
4949
{
50-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
50+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
5151
return(access(path,mode));
5252
#else
5353
int
@@ -71,7 +71,7 @@ static inline int access_utf8(const char *path,int mode)
7171

7272
static inline FILE *fopen_utf8(const char *path,const char *mode)
7373
{
74-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
74+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
7575
return(fopen(path,mode));
7676
#else
7777
FILE
@@ -105,14 +105,14 @@ static inline FILE *fopen_utf8(const char *path,const char *mode)
105105
#endif
106106
}
107107

108-
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
108+
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
109109
typedef int
110110
mode_t;
111111
#endif
112112

113113
static inline int open_utf8(const char *path,int flags,mode_t mode)
114114
{
115-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
115+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
116116
return(open(path,flags,mode));
117117
#else
118118
int
@@ -136,7 +136,7 @@ static inline int open_utf8(const char *path,int flags,mode_t mode)
136136

137137
static inline FILE *popen_utf8(const char *command,const char *type)
138138
{
139-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
139+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
140140
return(popen(command,type));
141141
#else
142142
FILE
@@ -172,7 +172,7 @@ static inline FILE *popen_utf8(const char *command,const char *type)
172172

173173
static inline int remove_utf8(const char *path)
174174
{
175-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
175+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
176176
return(unlink(path));
177177
#else
178178
int
@@ -196,7 +196,7 @@ static inline int remove_utf8(const char *path)
196196

197197
static inline int rename_utf8(const char *source,const char *destination)
198198
{
199-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
199+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
200200
return(rename(source,destination));
201201
#else
202202
int
@@ -231,7 +231,7 @@ static inline int rename_utf8(const char *source,const char *destination)
231231

232232
static inline int stat_utf8(const char *path,struct stat *attributes)
233233
{
234-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
234+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
235235
return(stat(path,attributes));
236236
#else
237237
int

‎coders/bmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#define BI_JPEG 4
7575
#undef BI_PNG
7676
#define BI_PNG 5
77-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
77+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
7878
#undef BI_RGB
7979
#define BI_RGB 0
8080
#undef BI_RLE8

‎coders/dib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static inline size_t MagickMin(const size_t x,const size_t y)
154154
static MagickBooleanType DecodeImage(Image *image,
155155
const MagickBooleanType compression,unsigned char *pixels)
156156
{
157-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
157+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
158158
#define BI_RGB 0
159159
#define BI_RLE8 1
160160
#define BI_RLE4 2

‎coders/icon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
/*
6969
Define declarations.
7070
*/
71-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
71+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
7272
#define BI_RGB 0
7373
#define BI_RLE8 1
7474
#define BI_BITFIELDS 3

‎coders/jpeg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
#include <setjmp.h>
8585
#if defined(MAGICKCORE_JPEG_DELEGATE)
8686
#define JPEG_INTERNAL_OPTIONS
87-
#if defined(__MINGW32__)
87+
#if defined(__MINGW32__) || defined(__MINGW64__)
8888
# define XMD_H 1 /* Avoid conflicting typedef for INT32 */
8989
#endif
9090
#undef HAVE_STDLIB_H

‎coders/msl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
#include "MagickCore/utility.h"
9494
#if defined(MAGICKCORE_XML_DELEGATE)
9595
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
96-
# if defined(__MINGW32__)
96+
# if defined(__MINGW32__) || defined(__MINGW64__)
9797
# define _MSC_VER
9898
# else
9999
# include <win32config.h>

‎coders/svg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#include "MagickCore/utility.h"
7676
#if defined(MAGICKCORE_XML_DELEGATE)
7777
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
78-
# if defined(__MINGW32__)
78+
# if defined(__MINGW32__) || defined(__MINGW64__)
7979
# define _MSC_VER
8080
# else
8181
# include <win32config.h>

‎coders/url.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#include "MagickCore/utility.h"
6060
#if defined(MAGICKCORE_XML_DELEGATE)
6161
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
62-
# if defined(__MINGW32__)
62+
# if defined(__MINGW32__) || defined(__MINGW64__)
6363
# define _MSC_VER
6464
# else
6565
# include <win32config.h>

‎utilities/animate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static int AnimateMain(int argc,char **argv)
8989
return(status);
9090
}
9191

92-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
92+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9393
int main(int argc,char **argv)
9494
{
9595
return(AnimateMain(argc,argv));

‎utilities/compare.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int CompareMain(int argc,char **argv)
8686
return(status);
8787
}
8888

89-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
89+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9090
int main(int argc,char **argv)
9191
{
9292
return(CompareMain(argc,argv));

‎utilities/composite.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static int CompositeMain(int argc,char **argv)
8080
return(status);
8181
}
8282

83-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
83+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
8484
int main(int argc,char **argv)
8585
{
8686
return(CompositeMain(argc,argv));

‎utilities/conjure.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static int ConjureMain(int argc,char **argv)
9999
return(status);
100100
}
101101

102-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
102+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
103103
int main(int argc,char **argv)
104104
{
105105
return(ConjureMain(argc,argv));

‎utilities/convert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int ConvertMain(int argc,char **argv)
8686
return(status);
8787
}
8888

89-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
89+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9090
int main(int argc,char **argv)
9191
{
9292
return(ConvertMain(argc,argv));

‎utilities/display.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static int DisplayMain(int argc,char **argv)
9494
return(status);
9595
}
9696

97-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
97+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9898
int main(int argc,char **argv)
9999
{
100100
return(DisplayMain(argc,argv));

‎utilities/identify.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static int IdentifyMain(int argc,char **argv)
8787
return(status);
8888
}
8989

90-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
90+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9191
int main(int argc,char **argv)
9292
{
9393
return(IdentifyMain(argc,argv));

‎utilities/import.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int ImportMain(int argc,char **argv)
8686
return(status);
8787
}
8888

89-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
89+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
9090
int main(int argc,char **argv)
9191
{
9292
return(ImportMain(argc,argv));

‎utilities/magick.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static int MagickMain(int argc,char **argv)
7979
return(status);
8080
}
8181

82-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
82+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
8383
int main(int argc,char **argv)
8484
{
8585
return(MagickMain(argc,argv));

‎utilities/mogrify.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int MogrifyMain(int argc,char **argv)
8282
return(status);
8383
}
8484

85-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
85+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
8686
int main(int argc,char **argv)
8787
{
8888
return(MogrifyMain(argc,argv));

‎utilities/montage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int MontageMain(int argc,char **argv)
8282
return(status);
8383
}
8484

85-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
85+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
8686
int main(int argc,char **argv)
8787
{
8888
return(MontageMain(argc,argv));

‎utilities/stream.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int StreamMain(int argc,char **argv)
8282
return(status);
8383
}
8484

85-
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
85+
#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
8686
int main(int argc,char **argv)
8787
{
8888
return(StreamMain(argc,argv));

0 commit comments

Comments
 (0)