From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Aug 2013 22:49:55 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/96cb27a9d2db3c01b8e296a0fbc1da1da09d1412?ds=inline;hp=-c

Merge branch 'maint'

* maint:
parse-options: fix clang opterror() -Wunused-value warning
---

96cb27a9d2db3c01b8e296a0fbc1da1da09d1412
diff --combined parse-options.h
index c378b75b13,cb226f77d4..9b94596e4a
--- a/parse-options.h
+++ b/parse-options.h
@@@ -140,9 -140,6 +140,9 @@@ struct option 
  #define OPT_DATE(s, l, v, h) \
  	{ OPTION_CALLBACK, (s), (l), (v), N_("time"),(h), 0,	\
  	  parse_opt_approxidate_cb }
 +#define OPT_EXPIRY_DATE(s, l, v, h) \
 +	{ OPTION_CALLBACK, (s), (l), (v), N_("expiry date"),(h), 0,	\
 +	  parse_opt_expiry_date_cb }
  #define OPT_CALLBACK(s, l, v, a, h, f) \
  	{ OPTION_CALLBACK, (s), (l), (v), (a), (h), 0, (f) }
  #define OPT_NUMBER_CALLBACK(v, h, f) \
@@@ -180,7 -177,7 +180,7 @@@ extern NORETURN void usage_msg_opt(cons
  
  extern int optbug(const struct option *opt, const char *reason);
  extern int opterror(const struct option *opt, const char *reason, int flags);
- #if defined(__GNUC__) && ! defined(clang)
+ #if defined(__GNUC__) && ! defined(__clang__)
  #define opterror(o,r,f) (opterror((o),(r),(f)), -1)
  #endif
  
@@@ -222,7 -219,6 +222,7 @@@ extern int parse_options_concat(struct 
  /*----- some often used options -----*/
  extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
  extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
 +extern int parse_opt_expiry_date_cb(const struct option *, const char *, int);
  extern int parse_opt_color_flag_cb(const struct option *, const char *, int);
  extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
  extern int parse_opt_with_commit(const struct option *, const char *, int);