parent
5a7caf2cb9
commit
725cc42085
@ -1,29 +1,30 @@
|
|||||||
--- libjpeg-turbo-1.4.2/win/jconfig.h.in.orig 2016-05-10 17:10:15.359564444 +0200
|
diff -rupN libjpeg-turbo-2.0.0/win/jconfig.h.in libjpeg-turbo-2.0.0-new/win/jconfig.h.in
|
||||||
+++ libjpeg-turbo-1.4.2/win/jconfig.h.in 2016-05-10 17:11:10.705555543 +0200
|
--- libjpeg-turbo-2.0.0/win/jconfig.h.in 2018-07-27 18:47:48.000000000 +0200
|
||||||
@@ -18,13 +18,13 @@
|
+++ libjpeg-turbo-2.0.0-new/win/jconfig.h.in 2018-08-01 00:53:23.644702905 +0200
|
||||||
|
@@ -9,13 +9,13 @@
|
||||||
|
|
||||||
#define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */
|
#define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */
|
||||||
|
|
||||||
-#define HAVE_UNSIGNED_CHAR
|
|
||||||
-#define HAVE_UNSIGNED_SHORT
|
|
||||||
+#define HAVE_UNSIGNED_CHAR 1
|
|
||||||
+#define HAVE_UNSIGNED_SHORT 1
|
|
||||||
/* #define void char */
|
|
||||||
/* #define const */
|
|
||||||
#undef __CHAR_UNSIGNED__
|
|
||||||
-#define HAVE_STDDEF_H
|
-#define HAVE_STDDEF_H
|
||||||
-#define HAVE_STDLIB_H
|
-#define HAVE_STDLIB_H
|
||||||
+#define HAVE_STDDEF_H 1
|
+#define HAVE_STDDEF_H 1
|
||||||
+#define HAVE_STDLIB_H 1
|
+#define HAVE_STDLIB_H 1
|
||||||
#undef NEED_BSD_STRINGS
|
|
||||||
#undef NEED_SYS_TYPES_H
|
#undef NEED_SYS_TYPES_H
|
||||||
#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
|
#undef NEED_BSD_STRINGS
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
-#define HAVE_UNSIGNED_CHAR
|
||||||
|
-#define HAVE_UNSIGNED_SHORT
|
||||||
|
+#define HAVE_UNSIGNED_CHAR 1
|
||||||
|
+#define HAVE_UNSIGNED_SHORT 1
|
||||||
|
#undef INCOMPLETE_TYPES_BROKEN
|
||||||
|
#undef RIGHT_SHIFT_IS_UNSIGNED
|
||||||
|
#undef __CHAR_UNSIGNED__
|
||||||
|
@@ -24,7 +24,7 @@
|
||||||
|
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
||||||
typedef unsigned char boolean;
|
typedef unsigned char boolean;
|
||||||
#endif
|
#endif
|
||||||
-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
||||||
+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */
|
+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */
|
||||||
|
|
||||||
/* Define "INT32" as int, not long, per Windows custom */
|
/* Define "INT32" as int, not long, per Windows custom */
|
||||||
#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
|
#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
|
||||||
|
Loading…
Reference in new issue