Changeset 40945 in vbox for trunk/include

Timestamp:

Apr 16, 2012 4:11:56 PM (13 years ago)

Author:

vboxsync

Message:

iprt: dance with NULL.

Location:

trunk/include/iprt

Files:

• cdefs.h (modified) (1 diff)
• types.h (modified) (2 diffs)

trunk/include/iprt/cdefs.h

@@ -1811 +1811 @@
 #endif
 
-
-/** @def NULL
- * NULL pointer.
- */
-#ifndef NULL
-# ifdef __cplusplus
-#  define NULL 0
-# else
-#  define NULL ((void*)0)
-# endif
-#endif
-
 /** @def NIL_OFFSET
  * NIL offset.

trunk/include/iprt/types.h

@@ -133 +133 @@
      */
 #  undef NULL
-#  if defined(__cplusplus)
-#   define NULL 0
-#  else
-#   define NULL ((void *)0)
-#  endif
 #  undef uintptr_t
 #  ifdef __GNUC__
@@ -159 +154 @@
 #  include <sys/types.h>
 # endif
+
+/** @def NULL
+ * NULL pointer.
+ */
+#ifndef NULL
+# ifdef __cplusplus
+#  define NULL 0
+# else
+#  define NULL ((void*)0)
+# endif
+#endif
 
 /* Define any types missing from sys/types.h on windows. */