aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-11-18 04:31:37 -0500
committerJunio C Hamano <gitster@pobox.com>2007-11-18 02:23:25 -0800
commit9f8a15c73437abc634f2c43501105b108c51eae8 (patch)
tree2668487edc19d7df6029850170d62a270e5c5c69 /cache.h
parentca74c458a3908314cf29b96f1c43fe2b2597de76 (diff)
downloadgit-9f8a15c73437abc634f2c43501105b108c51eae8.tar.gz
git-9f8a15c73437abc634f2c43501105b108c51eae8.tar.xz
Fix warning about bitfield in struct ref
cache.h:503: warning: type of bit-field 'force' is a GCC extension cache.h:504: warning: type of bit-field 'merge' is a GCC extension cache.h:505: warning: type of bit-field 'nonfastforward' is a GCC extension cache.h:506: warning: type of bit-field 'deletion' is a GCC extension So we change it to an 'unsigned int' which is not a GCC extension. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cache.h b/cache.h
index 81e8c88e4..6ccb76422 100644
--- a/cache.h
+++ b/cache.h
@@ -493,10 +493,10 @@ struct ref {
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
- unsigned char force : 1;
- unsigned char merge : 1;
- unsigned char nonfastforward : 1;
- unsigned char deletion : 1;
+ unsigned int force:1,
+ merge:1,
+ nonfastforward:1,
+ deletion:1;
enum {
REF_STATUS_NONE = 0,
REF_STATUS_OK,