PERFORCE change 43192 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Nov 30 14:57:03 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=43192
Change 43192 by marcel at marcel_nfs on 2003/11/30 14:56:40
rename <sys/null.h> to <sys/_null.h> to stick to tradition.
Pointed out by: jmallet
Affected files ...
.. //depot/projects/ia64/include/dirent.h#7 edit
.. //depot/projects/ia64/include/locale.h#6 edit
.. //depot/projects/ia64/include/rpc/types.h#4 edit
.. //depot/projects/ia64/include/stddef.h#7 edit
.. //depot/projects/ia64/include/stdio.h#15 edit
.. //depot/projects/ia64/include/stdlib.h#23 edit
.. //depot/projects/ia64/include/string.h#12 edit
.. //depot/projects/ia64/include/time.h#12 edit
.. //depot/projects/ia64/include/unistd.h#22 edit
.. //depot/projects/ia64/include/wchar.h#16 edit
.. //depot/projects/ia64/sys/sys/_null.h#1 add
.. //depot/projects/ia64/sys/sys/null.h#2 delete
.. //depot/projects/ia64/sys/sys/param.h#50 edit
.. //depot/projects/ia64/sys/sys/stddef.h#4 edit
Differences ...
==== //depot/projects/ia64/include/dirent.h#7 (text+ko) ====
@@ -54,6 +54,8 @@
#if __BSD_VISIBLE
+#include <sys/_null.h>
+
/* definitions for library routines operating on directories. */
#define DIRBLKSIZ 1024
@@ -81,8 +83,6 @@
#define DTF_REWIND 0x0004 /* rewind after reading union stack */
#define __DTF_READALL 0x0008 /* everything has been read */
-#include <sys/null.h>
-
#else /* !__BSD_VISIBLE */
typedef void * DIR;
==== //depot/projects/ia64/include/locale.h#6 (text+ko) ====
@@ -37,8 +37,7 @@
#ifndef _LOCALE_H_
#define _LOCALE_H_
-#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
struct lconv {
char *decimal_point;
@@ -77,6 +76,8 @@
#define _LC_LAST 7 /* marks end */
+#include <sys/cdefs.h>
+
__BEGIN_DECLS
struct lconv *localeconv(void);
char *setlocale(int, const char *);
==== //depot/projects/ia64/include/rpc/types.h#4 (text+ko) ====
@@ -39,8 +39,8 @@
#ifndef _RPC_TYPES_H
#define _RPC_TYPES_H
-#include <sys/null.h>
#include <sys/types.h>
+#include <sys/_null.h>
typedef int32_t bool_t;
typedef int32_t enum_t;
==== //depot/projects/ia64/include/stddef.h#7 (text+ko) ====
@@ -39,7 +39,7 @@
#define _STDDEF_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <sys/_types.h>
typedef __ptrdiff_t ptrdiff_t;
==== //depot/projects/ia64/include/stdio.h#15 (text+ko) ====
@@ -41,7 +41,7 @@
#define _STDIO_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <sys/_types.h>
typedef __off_t fpos_t;
==== //depot/projects/ia64/include/stdlib.h#23 (text+ko) ====
@@ -38,6 +38,7 @@
#define _STDLIB_H_
#include <sys/cdefs.h>
+#include <sys/_null.h>
#include <sys/_types.h>
#if __BSD_VISIBLE
@@ -69,8 +70,6 @@
long rem;
} ldiv_t;
-#include <sys/null.h>
-
#define EXIT_FAILURE 1
#define EXIT_SUCCESS 0
==== //depot/projects/ia64/include/string.h#12 (text+ko) ====
@@ -38,7 +38,7 @@
#define _STRING_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <sys/_types.h>
/*
==== //depot/projects/ia64/include/time.h#12 (text+ko) ====
@@ -46,7 +46,7 @@
#define _TIME_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <sys/_types.h>
#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE
==== //depot/projects/ia64/include/unistd.h#22 (text+ko) ====
@@ -40,6 +40,7 @@
#include <sys/cdefs.h>
#include <sys/types.h> /* XXX adds too much pollution. */
#include <sys/unistd.h>
+#include <sys/_null.h>
#include <sys/_types.h>
#ifndef _GID_T_DECLARED
@@ -81,8 +82,6 @@
#define STDOUT_FILENO 1 /* standard output file descriptor */
#define STDERR_FILENO 2 /* standard error file descriptor */
-#include <sys/null.h>
-
#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
#define F_ULOCK 0 /* unlock locked section */
#define F_LOCK 1 /* lock a section for exclusive use */
==== //depot/projects/ia64/include/wchar.h#16 (text+ko) ====
@@ -68,7 +68,7 @@
#define _WCHAR_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <sys/_types.h>
#include <machine/_limits.h>
==== //depot/projects/ia64/sys/sys/param.h#50 (text+ko) ====
@@ -42,6 +42,8 @@
#ifndef _SYS_PARAM_H_
#define _SYS_PARAM_H_
+#include <sys/_null.h>
+
#define BSD 199506 /* System version (year & month). */
#define BSD4_3 1
#define BSD4_4 1
@@ -59,8 +61,6 @@
#undef __FreeBSD_version
#define __FreeBSD_version 501114 /* Master, propagated to newvers */
-#include <sys/null.h>
-
#ifndef LOCORE
#include <sys/types.h>
#endif
==== //depot/projects/ia64/sys/sys/stddef.h#4 (text+ko) ====
@@ -30,7 +30,7 @@
#define _SYS_STDDEF_H_
#include <sys/cdefs.h>
-#include <sys/null.h>
+#include <sys/_null.h>
#include <machine/_types.h>
typedef __ptrdiff_t ptrdiff_t;
More information about the p4-projects
mailing list