mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-26 15:36:14 +01:00
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:
commit
5f9f1104b9
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user