From: Shawn O. Pearce Date: Sun, 18 Nov 2007 09:31:37 +0000 (-0500) Subject: Fix warning about bitfield in struct ref X-Git-Tag: v1.5.4-rc0~152^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f8a15c73437abc634f2c43501105b108c51eae8;p=git.git 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 Signed-off-by: Junio C Hamano --- 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,