diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-29 11:43:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-29 11:43:56 +0000 |
| commit | cb3493721e0f08d42f41165a7c089d9c11dcecab (patch) | |
| tree | d917206209d9efde4db73277cb63e7b64fdf330a /usr/src/uts/common/sys/null.h | |
| parent | c1b04cc49941ba5f94d242452bc2d3d0009e4050 (diff) | |
| parent | 947cdb3fe001e3ae9c98143dd04cc7d9ee13f40c (diff) | |
| download | illumos-joyent-cb3493721e0f08d42f41165a7c089d9c11dcecab.tar.gz | |
[illumos-gate merge]
commit 947cdb3fe001e3ae9c98143dd04cc7d9ee13f40c
12893 inconsistencies in mkfifo(1M)
commit 9117d17eb29235fc103fe0fa874b149d3f8a9a0e
12901 loader: can not read zfs pool with slog removed
commit 9b9e3196fde9c0f47c8cc4ab00f3bc5b539ceaca
12770 stop including exception unwind info in the kernel
commit dfecc46651d2b074027544a9c03682fd51d51054
12661 null.h: enable NULL pointer for SPARC
commit 4df3b64db8cae3f054ccdd573395ba7807bcd868
12654 nxge: smatch and NULL pointer errors
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 */ |