Replace all occurrences of NULL with NULLPTR for unified C and C++ null pointer handling

2025-09-16 15:59:56 +02:00
parent ba9e5b1b88
commit fabf3a3a5e
46 changed files with 294 additions and 288 deletions
--- a/sdk/xtdk/xtcompat.h
+++ b/sdk/xtdk/xtcompat.h
@@ -11,10 +11,18 @@


 #ifdef __cplusplus
-    #define XTCLINK extern "C"
+    /* C++ definitions */
+    #define XTCLINK         extern "C"
+    #define NULLPTR         nullptr
+
+    /* C++ types */
    typedef wchar_t wchar;
 #else
+    /* C definitions */
    #define XTCLINK
+    #define NULLPTR         ((void *)0)
+
+    /* C types */
    typedef unsigned short wchar;
 #endif

--- a/sdk/xtdk/xtdefs.h
+++ b/sdk/xtdk/xtdefs.h
@@ -29,10 +29,6 @@
 #define UNION                                  union
 #define VOLATILE                               volatile

-/* NULL values */
-#define NULL                                   ((PVOID) 0)
-#define NULL64                                 ((VOID * PVOID) 0)
-
 /* Type limits */
 #define MINCHAR                                0x80
 #define MAXCHAR                                0x7F