--- hatari/src/includes/scandir.h	2019/04/01 07:13:09	1.1
+++ hatari/src/includes/scandir.h	2019/04/09 08:54:30	1.1.1.5
@@ -1,12 +1,13 @@
 /*
   Hatari - scandir.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 #ifndef HATARI_SCANDIR_H
 #define HATARI_SCANDIR_H
 
+#include "config.h"
 #include <dirent.h>
 
 #ifdef QNX
@@ -15,9 +16,14 @@
 #define dirent direct
 #endif
 
-#if defined(__BEOS__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
-extern int alphasort(const void *d1, const void *d2);
-extern int scandir(const char *dirname, struct dirent ***namelist, int (*sdfilter)(struct dirent *), int (*dcomp)(const void *, const void *));
+#if !HAVE_ALPHASORT
+extern int alphasort(const struct dirent **d1, const struct dirent **d2);
+#endif
+
+#if !HAVE_SCANDIR
+extern int scandir(const char *dirname, struct dirent ***namelist,
+                   int (*sdfilter)(const struct dirent *),
+                   int (*comp)(const struct dirent **, const struct dirent **));
 #endif
 
 #endif /* HATARI_SCANDIR_H */