summaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-05 23:54:09 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-05 23:54:09 +0100
commit6e29ac23027ed9993c32e1f68d79068498a25165 (patch)
treefdf1b56baebc6685b22811304302184d948eb751 /cache.h
parentMerge branch 'ew/send-email-mutt-alias-fix' into maint (diff)
parentbswap: add NO_UNALIGNED_LOADS define (diff)
downloadgit-6e29ac23027ed9993c32e1f68d79068498a25165.tar.xz
git-6e29ac23027ed9993c32e1f68d79068498a25165.zip
Merge branch 'jk/clang-pedantic' into maint
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 c63fcc113a..ee0adc8992 100644
--- a/cache.h
+++ b/cache.h
@@ -214,7 +214,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)