diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-02 12:05:34 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-02 12:05:34 +0100 |
commit | 7c78c92a28ef43d68b172adf97fbd8a27be3baec (patch) | |
tree | 3a98b0d01865f5e00912521c58386eb008a70d07 /gnulib-m4/locale_h.m4 | |
parent | 4d76768442551c97a85e6f133cb818d223012746 (diff) | |
parent | 3ee36dc9787cee6ab5314af8f9c01b05a50e7d9d (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/locale_h.m4')
-rw-r--r-- | gnulib-m4/locale_h.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnulib-m4/locale_h.m4 b/gnulib-m4/locale_h.m4 index 563f8f81..db005a5b 100644 --- a/gnulib-m4/locale_h.m4 +++ b/gnulib-m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 19 -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +# locale_h.m4 serial 20 +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ AC_DEFUN([gl_LOCALE_H], dnl If <stddef.h> is replaced, then <locale.h> must also be replaced. AC_REQUIRE([gl_STDDEF_H]) - dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv' + dnl Solaris 11.0 defines the int_p_*, int_n_* members of 'struct lconv' dnl only if _LCONV_C99 is defined. AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in |