# HG changeset patch # User Bruno Haible # Date 1203874804 -3600 # Node ID 95c015b62dbc4701de51b5e2d246293660c80f89 # Parent 437f6b35e0e5cb25e38d81a218e3a7d861448189 Fix a build problem on HP-UX 10. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-22 Bruno Haible + + * m4/time_r.m4 (gl_TIME_R): Also check that localtime_r's return type + is a pointer type. Needed for HP-UX 10. + * doc/posix-functions/localtime_r.texi: Mention HP-UX 10. + * doc/posix-functions/gmtime_r.texi: Likewise. + Reported by Peter O'Gorman . + 2008-02-24 Bruno Haible * modules/environ-tests: New file. diff --git a/doc/posix-functions/gmtime_r.texi b/doc/posix-functions/gmtime_r.texi --- a/doc/posix-functions/gmtime_r.texi +++ b/doc/posix-functions/gmtime_r.texi @@ -16,5 +16,6 @@ This function is missing on some platforms: mingw. @item -Some platforms define a function of this name that is incompatible to POSIX. +Some platforms define a function of this name that is incompatible to POSIX: +HP-UX 10. @end itemize diff --git a/doc/posix-functions/localtime_r.texi b/doc/posix-functions/localtime_r.texi --- a/doc/posix-functions/localtime_r.texi +++ b/doc/posix-functions/localtime_r.texi @@ -16,5 +16,6 @@ This function is missing on some platforms: mingw. @item -Some platforms define a function of this name that is incompatible to POSIX. +Some platforms define a function of this name that is incompatible to POSIX: +HP-UX 10. @end itemize diff --git a/m4/time_r.m4 b/m4/time_r.m4 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions like localtime_r. -dnl Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006, 2007, 2008 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. @@ -23,7 +23,9 @@ even though the POSIX signature has the 'restrict's, since C99 says they can't affect type compatibility. */ struct tm * (*ptr) (time_t const *, struct tm *) = localtime_r; - if (ptr) return 0;], + if (ptr) return 0; + /* Check the return type is a pointer. On HP-UX 10 it is 'int'. */ + *localtime_r (0, 0);], [gl_cv_time_r_posix=yes], [gl_cv_time_r_posix=no])]) if test $gl_cv_time_r_posix = yes; then