Sync with trunk r63343.

[reactos.git] / include / reactos / libs / libjpeg / jconfig.h

diff --git a/include/reactos/libs/libjpeg/jconfig.h b/include/reactos/libs/libjpeg/jconfig.h
index 99172ce..6e7a009 100644 (file)
--- a/include/reactos/libs/libjpeg/jconfig.h
+++ b/include/reactos/libs/libjpeg/jconfig.h
@@ -1,12 +1,20 @@
 #define HAVE_PROTOTYPES
 #define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
 
 #define HAVE_STDDEF_H
 #define HAVE_STDLIB_H
 
+/* Define "boolean" as unsigned char, not enum, per Windows custom */
 #ifndef __RPCNDR_H__           /* don't conflict if rpcndr.h already read */
 typedef unsigned char boolean;
 #endif
+#ifndef FALSE                  /* in case these macros already exist */
+#define FALSE  0               /* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE   1
+#endif
 #define HAVE_BOOLEAN           /* prevent jmorecfg.h from redefining it */
 
 #undef NEED_BSD_STRINGS
@@ -14,5 +22,3 @@ typedef unsigned char boolean;
 #undef NEED_FAR_POINTERS       /* we presume a 32-bit flat memory model */
 #undef NEED_SHORT_EXTERNAL_NAMES
 #undef INCOMPLETE_TYPES_BROKEN
-
-// typedef long INT32;