summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2013-07-18 20:02:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-19 16:26:15 (GMT)
commit9fe3edc47f1f17a53272671c572c90ba71eb4f74 (patch)
treea1be4ae69fba938c0fc0b04a1fc87365e57d1b0a /builtin/revert.c
parent8dd0ee823f1829a3aa228c3c73e31de5c89b5317 (diff)
downloadgit-9fe3edc47f1f17a53272671c572c90ba71eb4f74.zip
git-9fe3edc47f1f17a53272671c572c90ba71eb4f74.tar.gz
git-9fe3edc47f1f17a53272671c572c90ba71eb4f74.tar.bz2
Add the LAST_ARG_MUST_BE_NULL macro
The sentinel function attribute is not understood by versions of the gcc compiler prior to v4.0. At present, for earlier versions of gcc, the build issues 108 warnings related to the unknown attribute. In order to suppress the warnings, we conditionally define the LAST_ARG_MUST_BE_NULL macro to provide the sentinel attribute for gcc v4.0 and newer. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/revert.c')
-rw-r--r--builtin/revert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index b8b5174..1d2648b 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -54,7 +54,7 @@ static int option_parse_x(const struct option *opt,
return 0;
}
-__attribute__((sentinel))
+LAST_ARG_MUST_BE_NULL
static void verify_opt_compatible(const char *me, const char *base_opt, ...)
{
const char *this_opt;
@@ -71,7 +71,7 @@ static void verify_opt_compatible(const char *me, const char *base_opt, ...)
die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
}
-__attribute__((sentinel))
+LAST_ARG_MUST_BE_NULL
static void verify_opt_mutually_compatible(const char *me, ...)
{
const char *opt1, *opt2 = NULL;