X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=0d3b244ddd52ada5f08fdb495237c1760778a289;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=5020f0714a89cd8420be47a06937390d00ea5450;hpb=2cf3be1d31b322cf45640f3019a32d19a8a9b6f8;p=git.git

diff --git a/cache.h b/cache.h
index 5020f071..0d3b244d 100644
--- a/cache.h
+++ b/cache.h
@@ -10,7 +10,7 @@
 #define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
 #endif
 
-#if defined(DT_UNKNOWN) && !NO_D_TYPE_IN_DIRENT
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
 #define DTYPE(de)	((de)->d_type)
 #else
 #undef DT_UNKNOWN
@@ -161,11 +161,13 @@ extern int hold_index_file_for_update(struct cache_file *, const char *path);
 extern int commit_index_file(struct cache_file *);
 extern void rollback_index_file(struct cache_file *);
 
+/* Environment bits from configuration mechanism */
 extern int trust_executable_bit;
 extern int assume_unchanged;
 extern int only_use_symrefs;
 extern int diff_rename_limit_default;
 extern int shared_repository;
+extern const char *apply_default_whitespace;
 
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;