diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:48:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:48:50 -0700 |
commit | 9b347673a1efbef525ff8b39f33f0b59e829be3c (patch) | |
tree | 2ba6b8b5de014fdb1f38460917a93a0dd66b29ed /diffcore.h | |
parent | 15520a858f5c3468eaa7f9c844218714d3bc1687 (diff) | |
parent | 7d0a9a752b66be76c4027ead98caa1be7bac5349 (diff) | |
download | git-9b347673a1efbef525ff8b39f33f0b59e829be3c.tar.gz |
Merge branch 'jk/diff-filespec-cleanup'
Portability fix to a topic already in v1.9
* jk/diff-filespec-cleanup:
diffcore.h: be explicit about the signedness of is_binary
Diffstat (limited to 'diffcore.h')
-rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 92788ee4de..c876dac71a 100644 --- a/diffcore.h +++ b/diffcore.h @@ -46,7 +46,7 @@ struct diff_filespec { unsigned is_stdin : 1; unsigned has_more_entries : 1; /* only appear in combined diff */ /* data should be considered "binary"; -1 means "don't know yet" */ - int is_binary : 2; + signed int is_binary : 2; struct userdiff_driver *driver; }; |