svn commit: r201602 - head/include

[Konstantin Belousov]

Author: kib
Date: Tue Jan  5 20:17:13 2010
New Revision: 201602
URL: http://svn.freebsd.org/changeset/base/201602

Log:
  Move scandir(3) and alphasort(3) into XSI namespace.
  
  Noted and reviewed by:	bde
  MFC after:	2 weeks

Modified:
  head/include/dirent.h

Modified: head/include/dirent.h
==============================================================================
--- head/include/dirent.h	Tue Jan  5 19:40:32 2010	(r201601)
+++ head/include/dirent.h	Tue Jan  5 20:17:13 2010	(r201602)
@@ -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 **));