Changes in abi/include/_bits/NULL.h [0aa5c8a:7c3fb9b] in mainline

File:

• abi/include/_bits/NULL.h (modified) (2 diffs)

abi/include/_bits/NULL.h

@@ -37 +37 @@
 /** @file
  * Definition of constant NULL.
+ *
+ * This definition is designed to work in both C and C++, and use
+ * the special constant `nullptr` in C++11 and above.
+ * Including this file is preferrable to defining the constant separately.
  */
 
@@ -42 +46 @@
 #define _BITS_NULL_H_
 
-#define __need_NULL
-#include <stddef.h>
+#ifndef NULL
+
+#if __cplusplus >= 201103L
+#define NULL  nullptr
+#elif defined(__cplusplus)
+#define NULL  0L
+#else
+#define NULL  ((void *) 0)
+#endif
+
+#endif
 
 #endif