From 0bdd79af62e8621359af08f0afca0ce977348ac7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 20 Jan 2006 13:33:20 -0800 Subject: [PATCH] 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 --- cache.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cache.h b/cache.h index 3d79c55a2..b493b65b7 100644 --- a/cache.h +++ b/cache.h @@ -13,6 +13,10 @@ #if defined(DT_UNKNOWN) && !NO_D_TYPE_IN_DIRENT #define DTYPE(de) ((de)->d_type) #else +#undef DT_UNKNOWN +#undef DT_DIR +#undef DT_REG +#undef DT_LNK #define DT_UNKNOWN 0 #define DT_DIR 1 #define DT_REG 2 -- 2.30.2