From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:42:00 +0000 (-0800)
Subject: Merge branch 'km/gettext-n'
X-Git-Tag: v2.4.0-rc0~135
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b19aab58f1bc44e9a6715f26ba32b8c9cda3b1fa

Merge branch 'km/gettext-n'

* km/gettext-n:
gettext.h: add parentheses around N_ expansion if supported
---

b19aab58f1bc44e9a6715f26ba32b8c9cda3b1fa
diff --cc Makefile
index c44eb3a851,be740010ea..e8ce649ca1
--- a/Makefile
+++ b/Makefile
@@@ -344,10 -340,14 +344,19 @@@ all:
  #
  # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.
  #
 +# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
 +#
 +# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
 +# cleanup the HMAC context with the older HMAC_cleanup function.
++#
+ # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
+ # compiles the following initialization:
+ #
+ #   static const char s[] = ("FOO");
+ #
+ # and define it to "no" if you need to remove the parentheses () around the
+ # constant.  The default is "auto", which means to use parentheses if your
+ # compiler is detected to support it.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN