From 47e7de17bc515581d85a6f1d57341d0ce14131ad Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 2 May 2002 14:15:46 +0000
Subject: Fix new filename stuff for WIN32.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2175 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/numericsort.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/numericsort.c')

diff --git a/src/numericsort.c b/src/numericsort.c
index 7220d0c94..4a30a1455 100644
--- a/src/numericsort.c
+++ b/src/numericsort.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: numericsort.c,v 1.10.2.4.2.3 2002/05/02 11:11:01 easysw Exp $"
+ * "$Id: numericsort.c,v 1.10.2.4.2.4 2002/05/02 14:15:46 easysw Exp $"
  *
  * Numeric sorting routine for the Fast Light Tool Kit (FLTK).
  *
@@ -31,11 +31,11 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#if defined(WIN32) && !defined(__CYGWIN__)
-#  include <FL/filename.H>
-#elif defined(HAVE_DIRENT_H)
+#include <FL/filename.H>
+
+#ifdef HAVE_DIRENT_H
 #  include <dirent.h>
-#else
+#elif !defined(WIN32) || defined(__CYGWIN__)
 #  define dirent direct
 #  if HAVE_SYS_NDIR_H
 #    include <sys/ndir.h>
@@ -48,10 +48,6 @@
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * 'numericsort()' - Compare two directory entries, possibly with
  *                   a case-insensitive comparison...
@@ -106,10 +102,6 @@ int fl_numericsort(struct dirent **A, struct dirent **B) {
   return numericsort(A, B, 1);
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
- * End of "$Id: numericsort.c,v 1.10.2.4.2.3 2002/05/02 11:11:01 easysw Exp $".
+ * End of "$Id: numericsort.c,v 1.10.2.4.2.4 2002/05/02 14:15:46 easysw Exp $".
  */
-- 
cgit v1.2.3