From 89bd9d36859503e25b767f97395870190f272bc1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 1 Mar 2013 07:16:43 -0800 Subject: Merge from gnulib. 2013-02-21 putenv: port better to native Windows 2013-02-18 extern-inline: avoid compilation error with HP-UX cc 2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv --- m4/extern-inline.m4 | 5 ++++- m4/gnulib-comp.m4 | 1 + m4/putenv.m4 | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 5880d4f454..0152f29326 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -18,13 +18,16 @@ AC_DEFUN([gl_EXTERN_INLINE], _GL_INLINE_HEADER_END contains useful stuff to put in the same include file, after uses of _GL_INLINE. + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + Suppress the use of extern inline on Apple's platforms, as Libc-825.25 (2012-09-19) is incompatible with it; see . Perhaps Apple will fix this some day. */ #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) \ + : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \ && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index a7987120c5..6c3012d827 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -271,6 +271,7 @@ AC_DEFUN([gl_INIT], gl_FUNC_PUTENV if test $REPLACE_PUTENV = 1; then AC_LIBOBJ([putenv]) + gl_PREREQ_PUTENV fi gl_STDLIB_MODULE_INDICATOR([putenv]) gl_FUNC_READLINK diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 9de53527a7..03ed4f97db 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -48,3 +48,9 @@ AC_DEFUN([gl_FUNC_PUTENV], ;; esac ]) + +# Prerequisites of lib/putenv.c. +AC_DEFUN([gl_PREREQ_PUTENV], +[ + AC_CHECK_FUNCS([_putenv]) +]) -- cgit v1.2.3