From e1cc3e0a9a5c7503ef2c272b49dc16edd66ffb1f Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Tue, 5 Jan 2010 20:17:13 +0000
Subject: [PATCH] Move scandir(3) and alphasort(3) into XSI namespace.

Noted and reviewed by:	bde
MFC after:	2 weeks
---
 include/dirent.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/dirent.h b/include/dirent.h
index 8d7e5c10c67e..375a3d2301b7 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -93,9 +93,11 @@ typedef	void *	DIR;
 #ifndef _KERNEL
 
 __BEGIN_DECLS
+#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
+int	 alphasort(const struct dirent **, const struct dirent **);
+#endif
 #if __BSD_VISIBLE
 DIR	*__opendir2(const char *, int);
-int	 alphasort(const struct dirent **, const struct dirent **);
 int	 getdents(int, char *, int);
 int	 getdirentries(int, char *, int, long *);
 #endif
@@ -107,7 +109,7 @@ struct dirent *
 int	 readdir_r(DIR *, struct dirent *, struct dirent **);
 #endif
 void	 rewinddir(DIR *);
-#if __BSD_VISIBLE
+#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
 int	 scandir(const char *, struct dirent ***,
 	    int (*)(const struct dirent *), int (*)(const struct dirent **,
 	    const struct dirent **));