From 164f199afc26eb684d0577d67b2b569595be2397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 19 Apr 2023 22:59:02 +0200 Subject: [PATCH] gmacros: Do not redefine NULL on C++ Even though having NULL as nullptr should be the standard for newer C++ versions, it may break some headers, so let's not touch it for now. Closes: https://gitlab.gnome.org/GNOME/glib/-/issues/2973 --- glib/gmacros.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/glib/gmacros.h b/glib/gmacros.h index 02ed33417..a7ed77541 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -918,9 +918,6 @@ # else # define NULL ((void*) 0) # endif /* G_CXX_STD_CHECK_VERSION (11) */ -#elif G_CXX_STD_CHECK_VERSION (11) -# undef NULL -# define NULL (nullptr) #endif #ifndef FALSE