Merge branch 'do-not-redefine-null-c++' into 'main'

gmacros: Do not redefine NULL on C++

Closes #2973

See merge request GNOME/glib!3387
This commit is contained in:
Emmanuele Bassi 2023-04-20 10:53:41 +00:00
commit 5f9f1104b9

View File

@ -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