luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gmacros.h
View File

@ -918,9 +918,6 @@
# else # else
# define NULL ((void*) 0) # define NULL ((void*) 0)
# endif /* G_CXX_STD_CHECK_VERSION (11) */ # endif /* G_CXX_STD_CHECK_VERSION (11) */
#elif G_CXX_STD_CHECK_VERSION (11)
# undef NULL
# define NULL (nullptr)
#endif #endif
#ifndef FALSE #ifndef FALSE