From db419ffbdeb55d653de05af01a4ba8bad71ba770 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 21 May 2024 21:56:04 +0100 Subject: [PATCH] Revert "Alias TRUE and FALSE to C99's true and false" This reverts commit 67d89a5a87a168ae4637b6c1032596df48e36892. Turns out that C++ doesn't like it when stuff goes from an integer to a boolean. See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/2900 --- glib/gmacros.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/glib/gmacros.h b/glib/gmacros.h index 403bad000..2d66c2f0c 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -39,9 +39,6 @@ */ #include -/* We include stdbool.h to get the system's definition of true and false */ -#include - /* * Note: Clang (but not clang-cl) defines __GNUC__ and __GNUC_MINOR__. * Both Clang 11.1 on current Arch Linux and Apple's Clang 12.0 define @@ -925,11 +922,11 @@ #endif #ifndef FALSE -#define FALSE false +#define FALSE (0) #endif #ifndef TRUE -#define TRUE true +#define TRUE (!FALSE) #endif #undef MAX