diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:09 -0800 |
| commit | 6e29ac23027ed9993c32e1f68d79068498a25165 (patch) | |
| tree | fdf1b56baebc6685b22811304302184d948eb751 /diff.h | |
| parent | Merge branch 'ew/send-email-mutt-alias-fix' into maint (diff) | |
| parent | bswap: add NO_UNALIGNED_LOADS define (diff) | |
| download | tgif-6e29ac23027ed9993c32e1f68d79068498a25165.tar.xz | |
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 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28) #define DIFF_OPT_FUNCCONTEXT (1 << 29) #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30) -#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31) +#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag) |