diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-17 12:38:54 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-17 12:44:49 -0800 |
commit | 23eecb48e39afd0d267d64d40ba6bf97aa865e13 (patch) | |
tree | 89e22d63dfa209f88300a8e3ed3e300391f124df /m4/gettimeofday.m4 | |
parent | 24846718507fe1565d64742a0a8c68acb680c640 (diff) | |
download | gnulib-23eecb48e39afd0d267d64d40ba6bf97aa865e13.tar.gz |
gettimeofday: port recent C++ fix to Emacs
Without this further patch, Emacs won't build due to
the portcheck failing. Also, this simplifies the patch a bit.
* lib/time.in.h (localtime, gmtime): Don't replace unless
GNULIB_GETTIMEOFDAY. Treat them more like mktime.
* lib/time.in.h (localtime, gmtime):
* m4/gettimeofday.m4 (gl_GETTIMEOFDAY_REPLACE_LOCALTIME):
* m4/time_h.m4 (gl_HEADER_TIME_H_DEFAULTS):
* modules/time (time.h):
Don't worry about about the possibility of localtime and gmtime
being absent; they're present in all C libraries we know about.
* m4/time_h.m4 (gl_HEADER_TIME_H_DEFAULTS):
Don't assume sys_time is present and has been initialized.
Instead, use a hack that should work even if it hasn't been.
Don't use a portcheck for gmtime or localtime; this supports
the hack.
* modules/time (time.h): Substitute GNULIB_GETTIMEOFDAY.
Diffstat (limited to 'm4/gettimeofday.m4')
-rw-r--r-- | m4/gettimeofday.m4 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index e4682bd99f..f48ef4365c 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 # Copyright (C) 2001-2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -127,13 +127,6 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_CHECK_FUNCS_ONCE([gmtime localtime]) - if test $ac_cv_func_gmtime != yes; then - HAVE_GMTIME=0 - fi - if test $ac_cv_func_localtime != yes; then - HAVE_LOCALTIME=0 - fi REPLACE_GMTIME=1 REPLACE_LOCALTIME=1 ]) |