9867cab152
spaces. Upstream keeps tweaking the boolean handling, but this still blows up with most C++ code, so we revert it again to the status quo from version 8.
27 lines
667 B
Plaintext
27 lines
667 B
Plaintext
$OpenBSD: patch-jmorecfg_h,v 1.2 2014/07/13 13:20:43 naddy Exp $
|
|
|
|
Restore assumptions about boolean/TRUE/FALSE to those of jpeg 8.
|
|
|
|
--- jmorecfg.h.orig Tue Sep 17 09:20:20 2013
|
|
+++ jmorecfg.h Wed Jul 9 17:20:38 2014
|
|
@@ -304,18 +304,13 @@ typedef void noreturn_t;
|
|
*/
|
|
|
|
#ifndef HAVE_BOOLEAN
|
|
-#if defined FALSE || defined TRUE || defined QGLOBAL_H
|
|
-/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
|
|
typedef int boolean;
|
|
+#endif
|
|
#ifndef FALSE /* in case these macros already exist */
|
|
#define FALSE 0 /* values of boolean */
|
|
#endif
|
|
#ifndef TRUE
|
|
#define TRUE 1
|
|
-#endif
|
|
-#else
|
|
-typedef enum { FALSE = 0, TRUE = 1 } boolean;
|
|
-#endif
|
|
#endif
|
|
|
|
|