diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-10-19 15:59:48 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-10-19 15:59:48 (GMT) |
| commit | 4cded1237286712299999dd182db650c302847fa (patch) | |
| tree | d68216e280669eaa432896fa1344464649cada5e | |
| parent | 584363263d25451302b85e28135bbff231d21479 (diff) | |
| download | mxe-4cded1237286712299999dd182db650c302847fa.zip mxe-4cded1237286712299999dd182db650c302847fa.tar.gz mxe-4cded1237286712299999dd182db650c302847fa.tar.bz2 | |
jpeg: Fix jmorecfg.h patch
Fixes compiling graphicsmagick
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
| -rw-r--r-- | src/jpeg-2-jmorecfg.patch | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/src/jpeg-2-jmorecfg.patch b/src/jpeg-2-jmorecfg.patch index c728e8b..be1f38b 100644 --- a/src/jpeg-2-jmorecfg.patch +++ b/src/jpeg-2-jmorecfg.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 6673c05939cc5ccda94b7706bbc81fd9b38aed0a Mon Sep 17 00:00:00 2001 +From 76b68a405c4e597d04564a0fb1fbe061aaeac2c6 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Mon, 13 Oct 2014 23:11:10 -0400 Subject: [PATCH] jmorecfg: Always include basetsd.h on Windows @@ -11,13 +11,15 @@ If you include the two files in the other order: #include <jmorecfg.h> #include <basetsd.h> -The definition of INT32 will clash. +The definition of INT32 etc. will clash. + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> diff --git a/jmorecfg.h b/jmorecfg.h -index 679d68b..ae6d3c2 100644 +index 679d68b..e143e90 100644 --- a/jmorecfg.h +++ b/jmorecfg.h -@@ -181,6 +181,10 @@ typedef char JOCTET; +@@ -181,8 +181,14 @@ typedef char JOCTET; * typedefs live at a different point on the speed/space tradeoff curve.) */ @@ -27,7 +29,39 @@ index 679d68b..ae6d3c2 100644 + /* UINT8 must hold at least the values 0..255. */ ++/* Microsoft and MinGW defines it in basetsd.h */ ++#if !defined(_BASETSD_H_) && !defined(_BASETSD_H) #ifdef HAVE_UNSIGNED_CHAR + typedef unsigned char UINT8; + #else /* not HAVE_UNSIGNED_CHAR */ +@@ -192,20 +198,27 @@ typedef char UINT8; + typedef short UINT8; + #endif /* CHAR_IS_UNSIGNED */ + #endif /* HAVE_UNSIGNED_CHAR */ ++#endif /* not _BASETSD_H */ + + /* UINT16 must hold at least the values 0..65535. */ + ++/* Microsoft and MinGW defines it in basetsd.h */ ++#if !defined(_BASETSD_H_) && !defined(_BASETSD_H) + #ifdef HAVE_UNSIGNED_SHORT + typedef unsigned short UINT16; + #else /* not HAVE_UNSIGNED_SHORT */ + typedef unsigned int UINT16; + #endif /* HAVE_UNSIGNED_SHORT */ ++#endif /* not _BASETSD_H */ + + /* INT16 must hold at least the values -32768..32767. */ + ++/* Microsoft and MinGW defines it in basetsd.h */ ++#if !defined(_BASETSD_H_) && !defined(_BASETSD_H) + #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */ + typedef short INT16; + #endif ++#endif /* not _BASETSD_H */ + + /* INT32 must hold at least signed 32-bit values. */ + -- 1.9.1 |