summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-10-28 15:01:12 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-28 15:01:12 -0700
commitdd65283408d9137e2f142e78dff2a1826baab5fd (patch)
tree7766ef3e327f5a00fec2ba646a58c3936812e79e /core
parente47a08b0a912b81234e7b50baf0a70c367c462f1 (diff)
downloadpdfium-dd65283408d9137e2f142e78dff2a1826baab5fd.tar.xz
Change FX_BOOL definition from int to bool.
If this CL sticks, we can then remove it entirely. Review-Url: https://codereview.chromium.org/2453473003
Diffstat (limited to 'core')
-rw-r--r--core/fxcrt/fx_system.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h
index 8364db3a4e..bcddf1aeeb 100644
--- a/core/fxcrt/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -65,11 +65,18 @@
#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.
@@ -83,14 +90,6 @@ 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");