CVS update: /ccvs/lib/

User: conradpino
Date: 05/05/26 02:15:34

Modified:
 /ccvs/lib/
  ChangeLog, glob_.h

Log:
 * glob_.h: Windows build fakes "ndir.h" which defines "struct direct"
 which differs from "dirent.h" which defines "struct dirent".

File Changes:

Directory: /ccvs/lib/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/ChangeLog?r1=1.444&r2=1.445
Delta lines:  +5 -0
-------------------
--- ChangeLog	25 May 2005 20:23:38 -0000	1.444
+++ ChangeLog	26 May 2005 09:15:31 -0000	1.445
@@ -1,3 +1,8 @@
+2004-05-26  Conrad T. Pino  <[email protected]>
+
+	* glob_.h: Windows build fakes "ndir.h" which defines "struct direct"
+	which differs from "dirent.h" which defines "struct dirent".
+
 2005-05-25  Derek Price  <[email protected]>
 
 	* glob.c (LOGIN_NAME_MAX): Wrap sysconf for Windows.

File [changed]: glob_.h
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob_.h?r1=1.11&r2=1.12
Delta lines:  +4 -0
-------------------
--- glob_.h	25 May 2005 19:52:12 -0000	1.11
+++ glob_.h	26 May 2005 09:15:31 -0000	1.12
@@ -127,8 +127,12 @@
        are used instead of the normal file access functions.  */
     void (*gl_closedir) (void *);
 #ifdef __USE_GNU
+#if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
     struct dirent *(*gl_readdir) (void *);
 #else
+    struct direct *(*gl_readdir) (void *);
+#endif
+#else
     void *(*gl_readdir) (void *);
 #endif
     void *(*gl_opendir) (__const char *);