diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-10-14 03:17:04 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-10-14 03:17:57 (GMT) |
| commit | a8f4f4647561b58f3afff657f76a0ea8cc06ee47 (patch) | |
| tree | 69853c68836ce53401274abae6e044f584740f77 /src | |
| parent | 8bbb84c782d493b98aa92375f3dfc2c046e9eb02 (diff) | |
| download | mxe-a8f4f4647561b58f3afff657f76a0ea8cc06ee47.zip mxe-a8f4f4647561b58f3afff657f76a0ea8cc06ee47.tar.gz mxe-a8f4f4647561b58f3afff657f76a0ea8cc06ee47.tar.bz2 | |
jpeg: Fix INT32 definition clash
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jpeg-2-jmorecfg.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/jpeg-2-jmorecfg.patch b/src/jpeg-2-jmorecfg.patch new file mode 100644 index 0000000..c728e8b --- /dev/null +++ b/src/jpeg-2-jmorecfg.patch @@ -0,0 +1,33 @@ +This file is part of MXE. +See index.html for further information. + +From 6673c05939cc5ccda94b7706bbc81fd9b38aed0a 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 + +If you include the two files in the other order: + + #include <jmorecfg.h> + #include <basetsd.h> + +The definition of INT32 will clash. + +diff --git a/jmorecfg.h b/jmorecfg.h +index 679d68b..ae6d3c2 100644 +--- a/jmorecfg.h ++++ b/jmorecfg.h +@@ -181,6 +181,10 @@ typedef char JOCTET; + * typedefs live at a different point on the speed/space tradeoff curve.) + */ + ++#ifdef _WIN32 ++#include <basetsd.h> ++#endif ++ + /* UINT8 must hold at least the values 0..255. */ + + #ifdef HAVE_UNSIGNED_CHAR +-- +1.9.1 + |