Merge /u/gmbr3/gnu-efi/ branch nullptr into master

https://sourceforge.net/p/gnu-efi/code/merge-requests/46/
2023-04-17 11:37:07 +00:00 · 2023-04-17 11:37:07 +00:00 · 362ef3db04
commit 362ef3db04
parent e0e1f53ce2 d0900861c2
1 changed files with 8 additions and 0 deletions
--- a/inc/efidef.h
+++ b/inc/efidef.h
@ -39,7 +39,15 @@ typedef bool BOOLEAN;
 #endif

 #ifndef NULL
+#if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L)
+    #define NULL    nullptr
+#else
+#if !defined(__cplusplus)
    #define NULL    ((VOID *) 0)
+#else
+    #define NULL    0
+#endif
+#endif
 #endif

 typedef UINTN           EFI_STATUS;