From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- core/include/thirdparties/libjpeg/jmorecfg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/include/thirdparties/libjpeg/jmorecfg.h') diff --git a/core/include/thirdparties/libjpeg/jmorecfg.h b/core/include/thirdparties/libjpeg/jmorecfg.h index e0a871e023..88d210954c 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 -- cgit v1.2.3