diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-05-28 20:21:59 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-05-28 20:21:59 +0300 |
| commit | 46cb763bffdbd1d2feea6d27344c48d16a511745 (patch) | |
| tree | 4eea9dd37e649dbfb3d24bbb1b03671db2f7ae0e /plugins/AdvaImg/src/LibJPEG/jmorecfg.h | |
| parent | c9bffd4f4e69fb1f34781cdf138b8b17e96b835b (diff) | |
AdvaImg: LibJPEG lib update to 9b
Diffstat (limited to 'plugins/AdvaImg/src/LibJPEG/jmorecfg.h')
| -rw-r--r-- | plugins/AdvaImg/src/LibJPEG/jmorecfg.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/AdvaImg/src/LibJPEG/jmorecfg.h b/plugins/AdvaImg/src/LibJPEG/jmorecfg.h index 1f645d7ff4..7407ac79b1 100644 --- a/plugins/AdvaImg/src/LibJPEG/jmorecfg.h +++ b/plugins/AdvaImg/src/LibJPEG/jmorecfg.h @@ -303,7 +303,10 @@ typedef void noreturn_t; * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
*/
-#ifdef HAVE_BOOLEAN
+#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;
#ifndef FALSE /* in case these macros already exist */
#define FALSE 0 /* values of boolean */
#endif
@@ -313,6 +316,7 @@ typedef void noreturn_t; #else
typedef enum { FALSE = 0, TRUE = 1 } boolean;
#endif
+#endif
/*
|