diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-11 11:18:28 (GMT) |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-11 11:18:28 (GMT) |
| commit | aa5be2cf2d0019a34855345e2497faa5c85c9fc7 (patch) | |
| tree | 9563ec9688d9f00094797b15feef3daa3a9fefc4 /src/3rdparty/libjpeg/jconfig.txt | |
| parent | 32ae0efae56a7b17880955561462363e6b432f65 (diff) | |
| parent | ce472d082a992547fdd51eb3eda2ee07d06802b6 (diff) | |
| download | Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.zip Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.tar.gz Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.tar.bz2 | |
Merge remote-tracking branch 'qt-releng-team/master'
Diffstat (limited to 'src/3rdparty/libjpeg/jconfig.txt')
| -rw-r--r-- | src/3rdparty/libjpeg/jconfig.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/jconfig.txt b/src/3rdparty/libjpeg/jconfig.txt index 8819e79..b96d312 100644 --- a/src/3rdparty/libjpeg/jconfig.txt +++ b/src/3rdparty/libjpeg/jconfig.txt @@ -91,6 +91,15 @@ */ #undef INCOMPLETE_TYPES_BROKEN +/* Define "boolean" as unsigned char, not int, on Windows systems. + */ +#ifdef _WIN32 +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +#endif + /* * The following options affect code selection within the JPEG library, |