summaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-20 20:43:29 +0100
committerJunio C Hamano <gitster@pobox.com>2016-01-20 20:43:29 +0100
commita736764a7b61534581021a21bc6bfc503b9cfa8f (patch)
treeafc0d6affb5a41ef36c169200c17deadbc4d0ff8 /cache.h
parentMerge branch 'ew/send-email-mutt-alias-fix' (diff)
parentbswap: add NO_UNALIGNED_LOADS define (diff)
downloadgit-a736764a7b61534581021a21bc6bfc503b9cfa8f.tar.xz
git-a736764a7b61534581021a21bc6bfc503b9cfa8f.zip
Merge branch 'jk/clang-pedantic'
A few unportable C construct have been spotted by clang compiler and have been fixed. * jk/clang-pedantic: bswap: add NO_UNALIGNED_LOADS define avoid shifting signed integers 31 bits
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index dcd654ffde..dfc459c063 100644
--- a/cache.h
+++ b/cache.h
@@ -215,7 +215,7 @@ struct cache_entry {
#define CE_INTENT_TO_ADD (1 << 29)
#define CE_SKIP_WORKTREE (1 << 30)
/* CE_EXTENDED2 is for future extension */
-#define CE_EXTENDED2 (1 << 31)
+#define CE_EXTENDED2 (1U << 31)
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)