diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /core/include/thirdparties/libjpeg/jmorecfg.h | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/include/thirdparties/libjpeg/jmorecfg.h')
| -rw-r--r-- | core/include/thirdparties/libjpeg/jmorecfg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/include/thirdparties/libjpeg/jmorecfg.h b/core/include/thirdparties/libjpeg/jmorecfg.h index 88d210954c..e0a871e023 100644 --- a/core/include/thirdparties/libjpeg/jmorecfg.h +++ b/core/include/thirdparties/libjpeg/jmorecfg.h @@ -230,7 +230,7 @@ typedef unsigned int JDIMENSION; /* - * On a few systems, type boolean and/or its values FALSE, TRUE may appear + * On a few systems, type boolean and/or its values false, true may appear * in standard header files. Or you may have conflicts with application- * specific header files that you want to include together with these files. * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. @@ -239,11 +239,11 @@ typedef unsigned int JDIMENSION; #ifndef HAVE_BOOLEAN typedef int boolean; #endif -#ifndef FALSE /* in case these macros already exist */ -#define FALSE 0 /* values of boolean */ +#ifndef false /* in case these macros already exist */ +#define false 0 /* values of boolean */ #endif -#ifndef TRUE -#define TRUE 1 +#ifndef true +#define true 1 #endif |