changeset 39166:ca2d16f02c02

strfmon_l: Fix compilation error with glibc 2.25. Reported by Tom G. Christensen <tgc@jupiterrise.com> in <https://lists.gnu.org/r/bug-gnulib/2017-11/msg00051.html>. * lib/monetary.in.h: Include also <locale.h>.
author Bruno Haible <bruno@clisp.org>
date Mon, 27 Nov 2017 00:26:01 +0100
parents 8c5e1d5c8e18
children 71ccf6e055b0
files ChangeLog lib/monetary.in.h
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 24 08:24:41 2017 -0800
+++ b/ChangeLog	Mon Nov 27 00:26:01 2017 +0100
@@ -1,3 +1,10 @@
+2017-11-26  Bruno Haible  <bruno@clisp.org>
+
+	strfmon_l: Fix compilation error with glibc 2.25.
+	Reported by Tom G. Christensen <tgc@jupiterrise.com>
+	in <https://lists.gnu.org/r/bug-gnulib/2017-11/msg00051.html>.
+	* lib/monetary.in.h: Include also <locale.h>.
+
 2017-11-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	posixtm: remove PDS_LEADING_YEAR
--- a/lib/monetary.in.h	Fri Nov 24 08:24:41 2017 -0800
+++ b/lib/monetary.in.h	Mon Nov 27 00:26:01 2017 +0100
@@ -29,9 +29,13 @@
 #ifndef _@GUARD_PREFIX@_MONETARY_H
 #define _@GUARD_PREFIX@_MONETARY_H
 
-#if @GNULIB_STRFMON_L@ && @HAVE_XLOCALE_H@
+#if @GNULIB_STRFMON_L@
+# if @HAVE_XLOCALE_H@
 /* Get locale_t on Mac OS X 10.12.  */
-# include <xlocale.h>
+#  include <xlocale.h>
+# endif
+/* Get locale_t on glibc 2.25.  */
+# include <locale.h>
 #endif
 
 /* Like in <stdio.h>.  */