diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-29 11:27:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-29 11:27:17 -0700 |
| commit | 747dcf775c5cb661e96a639f73322cc489d8590f (patch) | |
| tree | cd99067cb5f3d7601573e80f07892b826bc8e988 | |
| parent | dd65283408d9137e2f142e78dff2a1826baab5fd (diff) | |
| download | pdfium-747dcf775c5cb661e96a639f73322cc489d8590f.tar.xz | |
Revert of Change FX_BOOL definition from int to bool. (patchset #15 id:250001 of https://codereview.chromium.org/2453473003/ )
Reason for revert:
Potentially blocking the roll, speculative revert.
See: https://codereview.chromium.org/2464643002/
Original issue's description:
> Change FX_BOOL definition from int to bool.
>
> If this CL sticks, we can then remove it entirely.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/dd65283408d9137e2f142e78dff2a1826baab5fd
TBR=thestig@chromium.org,tsepez@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2461893002
| -rw-r--r-- | core/fxcrt/fx_system.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h index bcddf1aeeb..8364db3a4e 100644 --- a/core/fxcrt/fx_system.h +++ b/core/fxcrt/fx_system.h @@ -65,18 +65,11 @@ #ifdef __cplusplus extern "C" { -typedef bool FX_BOOL; // Deprecated. -#ifndef TRUE -#define TRUE true -#endif -#ifndef FALSE -#define FALSE false #endif -#endif // __cplusplus - typedef void* FX_POSITION; // Keep until fxcrt containers gone typedef float FX_FLOAT; // Keep, allow upgrade to doubles. typedef double FX_DOUBLE; // Keep, allow downgrade to floats. +typedef int FX_BOOL; // Keep, sadly not always 0 or 1. typedef char FX_CHAR; // Keep, questionable signedness. typedef wchar_t FX_WCHAR; // Keep, maybe bad platform wchars. @@ -90,6 +83,14 @@ typedef wchar_t FX_WCHAR; // Keep, maybe bad platform wchars. // TODO(palmer): it should be a |size_t|, or at least unsigned. typedef int FX_STRSIZE; +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + #ifdef __cplusplus static_assert(TRUE == true, "true_needs_to_be_true"); static_assert(FALSE == false, "false_needs_to_be_false"); |