diff options
Diffstat (limited to 'usr/src/uts/common/sys/null.h')
-rw-r--r-- | usr/src/uts/common/sys/null.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/usr/src/uts/common/sys/null.h b/usr/src/uts/common/sys/null.h index dc86fe9e8e..4009d3eaaf 100644 --- a/usr/src/uts/common/sys/null.h +++ b/usr/src/uts/common/sys/null.h @@ -20,38 +20,6 @@ #ifndef NULL -#if defined(__sparc) -/* - * SPARC code is not yet NULL pointer clean. - */ - -/* - * POSIX.1-2008 requires that the NULL macro be cast to type void *. - * Historically, this has not been done, so we only enable this in a - * POSIX.1-2008 compilation environment. - */ - -#if defined(_XPG7) && !defined(__cplusplus) -#define NULL ((void *)0) -#else - -/* - * ISO C++ requires that the NULL macro be a constant integral type evaluating - * to zero until C++11, and an integer or pointer literal with value zero from - * C++11 onwards. - */ - -#if defined(__cplusplus) && __cplusplus >= 201103L -#define NULL nullptr -#else -#if defined(_LP64) -#define NULL 0L -#else -#define NULL 0 -#endif /* _LP64 */ -#endif /* C++11 */ -#endif /* _XPG7 */ -#else /* * POSIX.1-2008 requires that the NULL macro be cast to type void *. */ @@ -76,7 +44,6 @@ #endif /* _LP64 */ #endif /* C++11 */ #endif /* !__cplusplus */ -#endif /* __sparc */ #endif /* NULL */ |