From: Bruno Haible <bruno@clisp.org>
Date: Mon, 20 Mar 2017 21:36:36 +0000 (+0100)
Subject: Fix compilation error in <libintl.h> on Cygwin.
X-Git-Tag: v0.20~473
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913;p=thirdparty%2Fgettext.git

Fix compilation error in <libintl.h> on Cygwin.

Reported by Michael Haubenwallner at https://savannah.gnu.org/bugs/?50595 .

* gettext-runtime/intl/libgnuintl.in.h (newlocale): Hide declaration if
  locale_t type is not visible on Cygwin.
---

diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index dc1947f8f..95dcc16ca 100644
--- a/gettext-runtime/intl/libgnuintl.in.h
+++ b/gettext-runtime/intl/libgnuintl.in.h
@@ -439,7 +439,10 @@ extern char *setlocale (int, const char *);
 
 #undef newlocale
 #define newlocale libintl_newlocale
+/* Declare newlocale() only if the system headers define the 'locale_t' type. */
+#if !(defined __CYGWIN__ && !defined LC_ALL_MASK)
 extern locale_t newlocale (int, const char *, locale_t);
+#endif
 
 #endif