DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
The recent Cygwin defines DT_UNKNOWN although it does not have d_type in struct dirent. Give an option to tell us not to use d_type on such platforms. Hopefully this problem will be transient. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 19, 2006 at 17:13 UTC
63be37b06fa873348c3de0becea201796bc88610
2 files changed
+8
-1
Makefile
+7
@@ -21,6 +21,9 @@ all:
21
#
22
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
23
#
24
+# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
25
+# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
26
+#
27
# Define NO_STRCASESTR if you don't have strcasestr.
28
#
29
# Define NO_SETENV if you don't have setenv in the C library.
@@ -236,6 +239,7 @@ ifeq ($(uname_S),SunOS)
239
ALL_CFLAGS += -D__EXTENSIONS__
240
endif
241
ifeq ($(uname_O),Cygwin)
242
+ NO_D_TYPE_IN_DIRENT = YesPlease
243
NO_D_INO_IN_DIRENT = YesPlease
244
NO_STRCASESTR = YesPlease
245
NEEDS_LIBICONV = YesPlease
@@ -337,6 +341,9 @@ ifdef NEEDS_NSL
341
LIBS += -lnsl
342
SIMPLE_LIB += -lnsl
343
endif
344
+ifdef NO_D_TYPE_IN_DIRENT
345
+ ALL_CFLAGS += -DNO_D_TYPE_IN_DIRENT
346
+endif
347
ifdef NO_D_INO_IN_DIRENT
348
ALL_CFLAGS += -DNO_D_INO_IN_DIRENT
349
endif
cache.h
+1
-1
@@ -10,7 +10,7 @@
10
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
11
#endif
12
13
-#ifdef DT_UNKNOWN
13
+#if defined(DT_UNKNOWN) && !NO_D_TYPE_IN_DIRENT
14
#define DTYPE(de) ((de)->d_type)
15
#else
16
#define DT_UNKNOWN 0