summaryrefslogtreecommitdiff
path: root/usr/src/head/iso
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/head/iso')
-rw-r--r--usr/src/head/iso/locale_iso.h10
-rw-r--r--usr/src/head/iso/stddef_iso.h15
-rw-r--r--usr/src/head/iso/stdio_iso.h10
-rw-r--r--usr/src/head/iso/stdlib_iso.h10
-rw-r--r--usr/src/head/iso/string_iso.h10
-rw-r--r--usr/src/head/iso/time_iso.h10
-rw-r--r--usr/src/head/iso/wchar_iso.h10
7 files changed, 17 insertions, 58 deletions
diff --git a/usr/src/head/iso/locale_iso.h b/usr/src/head/iso/locale_iso.h
index 4b410c838a..5ef1a4e9d0 100644
--- a/usr/src/head/iso/locale_iso.h
+++ b/usr/src/head/iso/locale_iso.h
@@ -21,6 +21,7 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -46,6 +47,7 @@
#define _ISO_LOCALE_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
@@ -99,14 +101,6 @@ struct lconv {
#define LC_MESSAGES 5
#define LC_ALL 6
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
extern char *setlocale(int, const char *);
extern struct lconv *localeconv(void);
diff --git a/usr/src/head/iso/stddef_iso.h b/usr/src/head/iso/stddef_iso.h
index 48a7ed6875..ce422a71e0 100644
--- a/usr/src/head/iso/stddef_iso.h
+++ b/usr/src/head/iso/stddef_iso.h
@@ -29,6 +29,10 @@
*/
/*
+ * Copyright 2014 PALO, Richard.
+ */
+
+/*
* An application should not include this header directly. Instead it
* should be included only through the inclusion of other Sun headers.
*
@@ -43,9 +47,8 @@
#ifndef _ISO_STDDEF_ISO_H
#define _ISO_STDDEF_ISO_H
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */
-
#include <sys/isa_defs.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
@@ -55,14 +58,6 @@ extern "C" {
namespace std {
#endif
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
#if !defined(_PTRDIFF_T) || __cplusplus >= 199711L
#define _PTRDIFF_T
#if defined(_LP64) || defined(_I32LPx)
diff --git a/usr/src/head/iso/stdio_iso.h b/usr/src/head/iso/stdio_iso.h
index 1dec847790..d09c982a9c 100644
--- a/usr/src/head/iso/stdio_iso.h
+++ b/usr/src/head/iso/stdio_iso.h
@@ -21,6 +21,7 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -49,6 +50,7 @@
#define _ISO_STDIO_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#include <sys/va_list.h>
#include <stdio_tag.h>
#include <stdio_impl.h>
@@ -110,14 +112,6 @@ typedef __longlong_t fpos_t;
}
#endif /* end of namespace std */
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
#define BUFSIZ 1024
/*
diff --git a/usr/src/head/iso/stdlib_iso.h b/usr/src/head/iso/stdlib_iso.h
index a2752ca421..2caa289e35 100644
--- a/usr/src/head/iso/stdlib_iso.h
+++ b/usr/src/head/iso/stdlib_iso.h
@@ -21,6 +21,7 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -46,6 +47,7 @@
#define _ISO_STDLIB_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
@@ -79,14 +81,6 @@ typedef unsigned int size_t; /* (historical version) */
#endif
#endif /* !_SIZE_T */
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
#define EXIT_FAILURE 1
#define EXIT_SUCCESS 0
#define RAND_MAX 32767
diff --git a/usr/src/head/iso/string_iso.h b/usr/src/head/iso/string_iso.h
index e1cae79472..7ed67d2240 100644
--- a/usr/src/head/iso/string_iso.h
+++ b/usr/src/head/iso/string_iso.h
@@ -25,6 +25,7 @@
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -46,6 +47,7 @@
#define _ISO_STRING_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
@@ -64,14 +66,6 @@ typedef unsigned int size_t; /* (historical version) */
#endif
#endif /* !_SIZE_T */
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
extern int memcmp(const void *, const void *, size_t);
extern void *memcpy(void *_RESTRICT_KYWD, const void *_RESTRICT_KYWD, size_t);
extern void *memmove(void *, const void *, size_t);
diff --git a/usr/src/head/iso/time_iso.h b/usr/src/head/iso/time_iso.h
index bc94ec8995..511e3cf6b4 100644
--- a/usr/src/head/iso/time_iso.h
+++ b/usr/src/head/iso/time_iso.h
@@ -24,6 +24,7 @@
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -45,6 +46,7 @@
#define _ISO_TIME_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
@@ -54,14 +56,6 @@ extern "C" {
namespace std {
#endif
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
#if !defined(_SIZE_T) || __cplusplus >= 199711L
#define _SIZE_T
#if defined(_LP64) || defined(_I32LPx)
diff --git a/usr/src/head/iso/wchar_iso.h b/usr/src/head/iso/wchar_iso.h
index 14763f0165..d7f35066d2 100644
--- a/usr/src/head/iso/wchar_iso.h
+++ b/usr/src/head/iso/wchar_iso.h
@@ -21,6 +21,7 @@
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -42,6 +43,7 @@
#define _ISO_WCHAR_ISO_H
#include <sys/feature_tests.h>
+#include <sys/null.h>
#include <stdio_tag.h>
#include <wchar_impl.h>
#include <iso/time_iso.h>
@@ -109,14 +111,6 @@ typedef unsigned int size_t; /* (historical version) */
#endif
#endif /* !defined(_SIZE_T) || __cplusplus >= 199711L */
-#ifndef NULL
-#if defined(_LP64)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif /* !NULL */
-
#ifndef WEOF
#if __cplusplus >= 199711L
#define WEOF ((std::wint_t)(-1))
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-25 15:22:06 +0000