X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=filebrowser%2Fdir.c;h=2ff53070758d86d85acd6663d0efb8c99e56c519;hb=a2f26aa3631ae35cb507615e547eccb9ac521083;hp=102187e83e8030158261a6de7ec399e716f62c22;hpb=373488935bf19680e26a3b51e617c9586dd438c6;p=xboard.git

diff --git a/filebrowser/dir.c b/filebrowser/dir.c
index 102187e..2ff5307 100644
--- a/filebrowser/dir.c
+++ b/filebrowser/dir.c
@@ -25,6 +25,8 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h> /* for qsort */
+#include "../config.h" /* to check for dirent.h */
 
 #ifdef SEL_FILE_IGNORE_CASE
 #include <ctype.h>
@@ -32,19 +34,15 @@
 
 #include "selfile.h"
 
-#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(__osf__)
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
-#else /* defined(SVR4) || defined(SYSV) || defined(USG) */
+#else
 #include <sys/dir.h>
 #define dirent direct
-#endif /* defined(SVR4) || defined(SYSV) || defined(USG) */
+#endif
 
 #include <sys/stat.h>
 
-#if defined(SVR4) || defined(SYSV) || defined(USG)
-extern void qsort();
-#endif /* defined(SVR4) || defined(SYSV) || defined(USG) */
-
 #ifdef SEL_FILE_IGNORE_CASE
 int
 SFcompareEntries(p, q)
@@ -147,11 +145,7 @@ SFgetDir(dir)
 		i++;
 	}
 
-#if defined(SVR4) || defined(SYSV) || defined(USG)
-	qsort((char *) result, (unsigned) i, sizeof(SFEntry), SFcompareEntries);
-#else /* defined(SVR4) || defined(SYSV) || defined(USG) */
-	qsort((char *) result, i, sizeof(SFEntry), SFcompareEntries);
-#endif /* defined(SVR4) || defined(SYSV) || defined(USG) */
+	qsort((char *) result, (size_t) i, sizeof(SFEntry), SFcompareEntries);
 
 	dir->entries = result;
 	dir->nEntries = i;