Fix scandir dirent stuff under WIN32.

Update dependencies.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2193 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 58 insertions, 59 deletions

diff --git a/src/makedepend b/src/makedepend
index 47f7af337..35c337f79 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -68,8 +68,8 @@ Fl_File_Browser.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
 Fl_File_Browser.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 Fl_File_Browser.o: ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_File_Browser.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-Fl_File_Browser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/fl_draw.H
-Fl_File_Browser.o: ../FL/filename.H flstring.h ../config.h
+Fl_File_Browser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H
+Fl_File_Browser.o: ../FL/fl_draw.H ../FL/filename.H flstring.h ../config.h
 Fl_File_Chooser.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H
 Fl_File_Chooser.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fl_File_Chooser.o: ../FL/Fl_Widget.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
@@ -77,10 +77,10 @@ Fl_File_Chooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Button.H ../FL/fl_ask.H
 Fl_File_Chooser.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
 Fl_File_Chooser.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 Fl_File_Chooser.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H
-Fl_File_Chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-Fl_File_Chooser.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
-Fl_File_Chooser.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H
-Fl_File_Chooser.o: ../FL/Fl_Window.H
+Fl_File_Chooser.o: ../FL/filename.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
+Fl_File_Chooser.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
+Fl_File_Chooser.o: ../FL/Fl_Button.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
+Fl_File_Chooser.o: ../FL/x.H ../FL/Fl_Window.H
 Fl_File_Chooser2.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H
 Fl_File_Chooser2.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fl_File_Chooser2.o: ../FL/Fl_Widget.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
@@ -88,8 +88,8 @@ Fl_File_Chooser2.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Button.H ../FL/fl_ask.H
 Fl_File_Chooser2.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
 Fl_File_Chooser2.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
 Fl_File_Chooser2.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-Fl_File_Chooser2.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/Fl_File_Input.H
-Fl_File_Chooser2.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fl_File_Chooser2.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H
+Fl_File_Chooser2.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 Fl_File_Chooser2.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 Fl_File_Chooser2.o: ../FL/filename.H ../FL/x.H ../FL/Fl_Window.H flstring.h
 Fl_File_Chooser2.o: ../config.h
@@ -299,14 +299,13 @@ Fl_visual.o: ../FL/x.H ../FL/Fl_Window.H
 Fl_x.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_x.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fl_x.o: ../FL/Fl_Widget.H flstring.h
-filename_absolute.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h
-filename_absolute.o: ../config.h
-filename_expand.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h ../config.h
-filename_ext.o: ../FL/filename.H ../FL/Fl_Export.H
-filename_isdir.o: flstring.h ../config.h ../FL/filename.H ../FL/Fl_Export.H
-filename_list.o: ../config.h ../FL/filename.H ../FL/Fl_Export.H
-filename_match.o: ../FL/filename.H ../FL/Fl_Export.H
-filename_setext.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h ../config.h
+filename_absolute.o: ../FL/filename.H flstring.h ../config.h
+filename_expand.o: ../FL/filename.H flstring.h ../config.h
+filename_ext.o: ../FL/filename.H
+filename_isdir.o: flstring.h ../config.h ../FL/filename.H
+filename_list.o: ../config.h ../FL/filename.H flstring.h
+filename_match.o: ../FL/filename.H
+filename_setext.o: ../FL/filename.H flstring.h ../config.h
 fl_arc.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/math.h
 fl_arci.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H
 fl_arci.o: ../FL/Fl_Window.H
@@ -341,18 +340,19 @@ fl_draw_pixmap.o: ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H
 fl_draw_pixmap.o: ../FL/Fl_Window.H flstring.h
 fl_engraved_label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_engraved_label.o: ../FL/Fl_Widget.H ../FL/fl_draw.H
-fl_file_dir.o: ../config.h ../FL/filename.H ../FL/Fl_Export.H
-fl_file_dir.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H
+fl_file_dir.o: ../config.h ../FL/filename.H ../FL/Fl_File_Chooser.H
+fl_file_dir.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_file_dir.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 fl_file_dir.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 fl_file_dir.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_File_Browser.H
 fl_file_dir.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
 fl_file_dir.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H
-fl_file_dir.o: ../FL/Fl.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
-fl_file_dir.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
+fl_file_dir.o: ../FL/Fl.H ../FL/filename.H ../FL/Fl_File_Input.H
+fl_file_dir.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
+fl_file_dir.o: ../FL/Fl_Button.H
 fl_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_font.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.h
-fl_font.o: fl_font_x.cxx
+fl_font.o: fl_font_xft.cxx
 fl_labeltype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/fl_draw.H
 fl_labeltype.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
@@ -376,7 +376,7 @@ fl_set_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_set_font.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.h
 fl_set_fonts.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_set_fonts.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.h
-fl_set_fonts.o: fl_set_fonts_x.cxx
+fl_set_fonts.o: fl_set_fonts_xft.cxx
 fl_scroll_area.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_scroll_area.o: ../FL/Fl_Window.H
 fl_shadow_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -413,6 +413,6 @@ glut_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H
 glut_font.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
 glut_font.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H
 glut_font.o: ../FL/Fl_Window.H
-scandir.o: ../config.h
-numericsort.o: ../config.h
+scandir.o: flstring.h ../config.h
+numericsort.o: ../config.h ../FL/filename.H
 vsnprintf.o: flstring.h ../config.h
diff --git a/src/scandir.c b/src/scandir.c
index 1e52da9d2..b4753ec03 100644
--- a/src/scandir.c
+++ b/src/scandir.c
@@ -17,36 +17,32 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 USA.  */
 
 #if defined(WIN32) && !defined(__CYGWIN__)
-#include "scandir_win32.c"
+#  include "scandir_win32.c"
 #else
 
-#include <config.h>
-
-#if HAVE_SCANDIR
-#else
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-
-#if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
+#  include "flstring.h"
+
+#  if !HAVE_SCANDIR
+#    include <stdlib.h>
+#    include <sys/types.h>
+#    include <errno.h>
+
+#    if HAVE_DIRENT_H
+#      include <dirent.h>
+#      define NAMLEN(dirent) strlen((dirent)->d_name)
+#    else
+#      define dirent direct
+#      define NAMLEN(dirent) (dirent)->d_namlen
+#      if HAVE_SYS_NDIR_H
+#        include <sys/ndir.h>
+#      endif
+#      if HAVE_SYS_DIR_H
+#        include <sys/dir.h>
+#      endif
+#      if HAVE_NDIR_H
+#        include <ndir.h>
+#      endif
+#    endif
 
 int
 fl_scandir(const char *dir, struct dirent ***namelist,
@@ -88,8 +84,8 @@ fl_scandir(const char *dir, struct dirent ***namelist,
           v = newv;
         }
 
-#define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
-#define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
+#    define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
+#    define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
                               _D_EXACT_NAMLEN (d) + 1)
 
       dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d;
@@ -120,5 +116,9 @@ fl_scandir(const char *dir, struct dirent ***namelist,
   return i;
 }
 
+#  endif
 #endif
-#endif
+
+/*
+ * End of "$Id: scandir.c,v 1.4.2.1.2.2 2002/05/04 12:37:41 easysw Exp $".
+ */
diff --git a/src/scandir_win32.c b/src/scandir_win32.c
index 33598f8d6..4d4d892af 100644
--- a/src/scandir_win32.c
+++ b/src/scandir_win32.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: scandir_win32.c,v 1.11.2.4.2.4 2002/05/02 11:11:01 easysw Exp $"
+ * "$Id: scandir_win32.c,v 1.11.2.4.2.5 2002/05/04 12:37:41 easysw Exp $"
  *
  * WIN32 scandir function for the Fast Light Tool Kit (FLTK).
  *
@@ -26,12 +26,11 @@
 #ifndef __CYGWIN__
 /* Emulation of posix scandir() call */
 
+#include <FL/filename.H>
 #include "flstring.h"
 #include <windows.h>
 #include <stdlib.h>
 
-struct dirent { char d_name[1]; };
-
 int fl_scandir(const char *dirname, struct dirent ***namelist,
 	       int (*select)(struct dirent *),
 	       int (*compar)(struct dirent **, struct dirent **)) {
@@ -104,5 +103,5 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
 #endif
 
 /*
- * End of "$Id: scandir_win32.c,v 1.11.2.4.2.4 2002/05/02 11:11:01 easysw Exp $".
+ * End of "$Id: scandir_win32.c,v 1.11.2.4.2.5 2002/05/04 12:37:41 easysw Exp $".
  */