mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 10:56:56 +00:00
7d4ebb526c
By porting a patch from msys2.
20 lines
624 B
Diff
20 lines
624 B
Diff
Ported to updated libjpeg-turbo from
|
|
https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/jpeg-typedefs.patch
|
|
--- a/jmorecfg.h 2012-02-10 06:47:55 +0300
|
|
+++ b/jmorecfg.h 2012-05-03 10:29:13 +0400
|
|
@@ -224,7 +224,13 @@
|
|
* Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
|
|
*/
|
|
|
|
-#ifndef HAVE_BOOLEAN
|
|
+#if defined(_WIN32) && !defined(HAVE_BOOLEAN)
|
|
+#ifndef __RPCNDR_H__
|
|
+typedef unsigned char boolean;
|
|
+#endif
|
|
+#define HAVE_BOOLEAN
|
|
+#endif
|
|
+#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__)
|
|
typedef int boolean;
|
|
#endif
|
|
#ifndef FALSE /* in case these macros already exist */
|