diff options
| -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"); |