From b37c889bf62a36bfc3a70a30cb8c6e2e9b253d51 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Tue, 13 Dec 2005 00:35:25 +0000
Subject: First step in include files overhaul.  Use __FOO_VISIBLE (as defined
 in sys/cdefs.h) instead of _FOO_SOURCE.  Also fix several namespace pollution
 issues, including the byte order defines.  OK deraadt@

---
 include/dirent.h | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'include/dirent.h')

diff --git a/include/dirent.h b/include/dirent.h
index e32e1f0cea4..05e5c83cd61 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.14 2005/06/18 18:09:42 millert Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.15 2005/12/13 00:35:22 millert Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -35,10 +35,12 @@
 #ifndef _DIRENT_H_
 #define _DIRENT_H_
 
+#include <sys/cdefs.h>
+
 /*
  * POSIX doesn't mandate this, but X/Open XPG 4.2 does.
  */
-#ifndef _POSIX_SOURCE
+#if __BSD_VISIBLE || __XPG_VISIBLE >= 420
 #include <sys/types.h>
 #endif
 
@@ -48,11 +50,11 @@
  */
 #include <sys/dirent.h>
 
-#ifdef _POSIX_SOURCE
-typedef void *	DIR;
-#else
-
+#if __BSD_VISIBLE || __XPG_VISIBLE
 #define	d_ino		d_fileno	/* backward compatibility */
+#endif
+
+#if __BSD_VISIBLE
 
 /* definitions for library routines operating on directories. */
 #define	DIRBLKSIZ	1024
@@ -80,31 +82,36 @@ typedef struct _dirdesc {
 #define	NULL	__null
 #else
 #define	NULL	0L
-#endif
-#endif
+#endif /* __GNUG__ */
+#endif /* !NULL */
 
-#endif /* _POSIX_SOURCE */
+#else /* !__BSD_VISIBLE */
 
-#ifndef _KERNEL
+typedef void *	DIR;
 
-#include <sys/cdefs.h>
+#endif /* !__BSD_VISIBLE */
 
+#ifndef _KERNEL
 __BEGIN_DECLS
 DIR *opendir(const char *);
 struct dirent *readdir(DIR *);
 void rewinddir(DIR *);
 int closedir(DIR *);
-#ifndef _POSIX_SOURCE
+#if __BSD_VISIBLE
 DIR *__opendir2(const char *, int);
-long telldir(const DIR *);
-void seekdir(DIR *, long);
 int scandir(const char *, struct dirent ***,
     int (*)(struct dirent *), int (*)(const void *, const void *));
 int alphasort(const void *, const void *);
 int getdirentries(int, char *, int, long *)
 		__attribute__ ((__bounded__(__string__,2,3)));
-#endif /* not POSIX */
+#endif /* __BSD_VISIBLE */
+#if __XPG_VISIBLE
+long telldir(const DIR *);
+void seekdir(DIR *, long);
+#endif
+#if __POSIX_VISIBLE >= 199506 || __XPG_VISIBLE >= 500
 int readdir_r(DIR *, struct dirent *, struct dirent **);
+#endif
 __END_DECLS
 
 #endif /* !_KERNEL */
-- 
cgit v1.2.3