summaryrefslogtreecommitdiffstats
path: root/include/dirent.h
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2003-12-07 21:10:06 +0000
committermarcel <marcel@FreeBSD.org>2003-12-07 21:10:06 +0000
commit89b1ef2eaa8f8599da1b52f5e9393dda6fcbd8e8 (patch)
tree9b033e9ca59d72fe94f812d9b6d08476039b8049 /include/dirent.h
parente9b8241ac79bbe4abe781d5d5fde761882ac90a1 (diff)
downloadFreeBSD-src-89b1ef2eaa8f8599da1b52f5e9393dda6fcbd8e8.zip
FreeBSD-src-89b1ef2eaa8f8599da1b52f5e9393dda6fcbd8e8.tar.gz
Change the definition of NULL on ia64 (for LP64 compilations) from
an int constant to a long constant. This change improves consistency in the following two ways: 1. The first 8 arguments are always passed in registers on ia64, which by virtue of the generated code implicitly widens ints to longs and allows the use of an 32-bit integral type for 64-bit arguments. Subsequent arguments are passed onto the memory stack, which does not exhibit the same behaviour and consequently do not allow this. In practice this means that variadic functions taking pointers and given NULL (without cast) work as long as the NULL is passed in one of the first 8 arguments. A SIGSEGV is more likely the result if such would be done for stack-based arguments. This is due to the fact that the upper 4 bytes remain undefined. 2. All 64-bit platforms that FreeBSD supports, with the obvious exception of ia64, allow 32-bit integral types (specifically NULL) when 64-bit pointers are expected in variadic functions by way of how the compiler generates code. As such, code that works correctly (whether rightfully so or not) on any platform other than ia64, may fail on ia64. To more easily allow tweaking of the definition of NULL, this commit removes the 12 definitions in the various headers and puts it in a new header that can be included whenever NULL is to be made visible. This commit fixes GNOME, emacs, xemacs and a whole bunch of ports that I don't particularly care about at this time...
Diffstat (limited to 'include/dirent.h')
-rw-r--r--include/dirent.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/dirent.h b/include/dirent.h
index f6e4ccd..d686daf 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -54,6 +54,8 @@
#if __BSD_VISIBLE
+#include <sys/_null.h>
+
/* definitions for library routines operating on directories. */
#define DIRBLKSIZ 1024
@@ -81,10 +83,6 @@ typedef struct _dirdesc {
#define DTF_REWIND 0x0004 /* rewind after reading union stack */
#define __DTF_READALL 0x0008 /* everything has been read */
-#ifndef NULL
-#define NULL 0
-#endif
-
#else /* !__BSD_VISIBLE */
typedef void * DIR;
OpenPOWER on IntegriCloud