Undef DT_* before redefining them.
When overriding DT_* macro detection with NO_D_TYPE_IN_DIRENT (recent Cygwin build problem, which hopefully is already fixed in their CVS snapshot version), we define DTYPE() macro to return just "we do not know", but still needed to use DT_* macro to avoid ifdef in the code we use them. If the platform defines DT_* macro but with unusable d_type, this would have resulted in us redefining these preprocessor symbols. Admittedly, that would be just a couple of compilation warnings, and on Cygwin at least this particular problem is transitory (the problem is already fixed in their CVS snapshot version), so this is a low priority fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 20, 2006 at 13:33 UTC
0bdd79af62e8621359af08f0afca0ce977348ac7
1 file changed
+4
cache.h
+4
@@ -13,6 +13,10 @@
13
#if defined(DT_UNKNOWN) && !NO_D_TYPE_IN_DIRENT
14
#define DTYPE(de) ((de)->d_type)
15
#else
16
+#undef DT_UNKNOWN
17
+#undef DT_DIR
18
+#undef DT_REG
19
+#undef DT_LNK
20
#define DT_UNKNOWN 0
21
#define DT_DIR 1
22
#define DT_REG 2