blob: ff448f21a66c4359e3b55dd1f3d4f67f27bb3879 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 6 Sep 2015 23:16:12 +1000
Subject: [PATCH] fix typedef conflicts
taken from:
https://aur.archlinux.org/cgit/aur.git/tree/0001-header-compat.mingw.patch?h=mingw-w64-libjpeg-turbo
diff --git a/jmorecfg.h b/jmorecfg.h
index 1111111..2222222 100644
--- a/jmorecfg.h
+++ b/jmorecfg.h
@@ -14,7 +14,13 @@
* optimizations. Most users will not need to touch this file.
*/
+/* prevents conflicts */
+#if defined(__MINGW32__)
+#include <shlwapi.h> /* typedefs INT16 and INT32 */
+#define HAVE_BOOLEAN
+#endif
+
/*
* Maximum number of components (color channels) allowed in JPEG image.
* To meet the letter of the JPEG spec, set this to 255. However, darn
|
