X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgettimeofday.m4;h=b9bbb1081bcf18e1c322f4b1395f6c787f16a773;hb=e52fa80b73cf84d7e5472aeb43ead4e25dbd5989;hp=51b916a819915ad308d1040a1cd6a45c89c4bd93;hpb=e5ba383c5c9684ed2abe901d35485b86725fbea8;p=gnulib.git diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 51b916a81..b9bbb1081 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,86 +1,46 @@ -#serial 8 +#serial 11 # Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +dnl From Jim Meyering. + AC_DEFUN([gl_FUNC_GETTIMEOFDAY], [ AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([AC_HEADER_TIME]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) - AC_CHECK_FUNCS([gettimeofday]) - - AC_CHECK_TYPE([suseconds_t], , - [AC_DEFINE([suseconds_t], [int], - [Define to `int' if `suseconds_t' is missing.]) - ], - [ -# if TIME_WITH_SYS_TIME -# include -# include -# else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -# endif - ]) + AC_REQUIRE([gl_HEADER_SYS_TIME_H]) + AC_CHECK_FUNCS_ONCE([gettimeofday]) - AC_CACHE_CHECK([for struct timeval], [fu_cv_sys_struct_timeval], - [AC_TRY_COMPILE( - [ -# if TIME_WITH_SYS_TIME -# include -# include -# else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -# endif - ], - [static struct timeval x; x.tv_sec = x.tv_usec;], - fu_cv_sys_struct_timeval=yes, - fu_cv_sys_struct_timeval=no) - ]) - - if test $fu_cv_sys_struct_timeval = yes; then - AC_DEFINE(HAVE_STRUCT_TIMEVAL, 1, - [Define if struct timeval is declared in or . ]) - fi - - AC_CACHE_CHECK([for gettimeofday whose signature conforms to POSIX], - [ac_cv_func_gettimeofday_posix_signature], - [AC_LINK_IFELSE( + AC_CACHE_CHECK([for gettimeofday with POSIX signature], + [gl_cv_func_gettimeofday_posix_signature], + [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[#include - time_t a; - suseconds_t b; + [[#include struct timeval c; ]], [[ - int x = gettimeofday (&c, 0); int (*f) (struct timeval *restrict, void *restrict) = gettimeofday; + int x = f (&c, 0); return !(x | c.tv_sec | c.tv_usec); ]])], - [ac_cv_func_gettimeofday_posix_signature=yes], - [ac_cv_func_gettimeofday_posix_signature=no])]) - if test $ac_cv_func_gettimeofday_posix_signature = yes; then - AC_DEFINE([HAVE_GETTIMEOFDAY_POSIX_SIGNATURE], 1, - [Define if gettimeofday's signature conforms to POSIX.]) - AC_FUNC_GETTIMEOFDAY_CLOBBER - else - gl_PREREQ_GETTIMEOFDAY - AC_LIBOBJ([gettimeofday]) + [gl_cv_func_gettimeofday_posix_signature=yes], + [gl_cv_func_gettimeofday_posix_signature=no])]) + + gl_FUNC_GETTIMEOFDAY_CLOBBER + + if test $gl_cv_func_gettimeofday_posix_signature != yes; then + REPLACE_GETTIMEOFDAY=1 + SYS_TIME_H=sys/time.h + if test $gl_cv_func_gettimeofday_clobber != yes; then + AC_LIBOBJ(gettimeofday) + gl_PREREQ_GETTIMEOFDAY + fi fi ]) -dnl From Jim Meyering. -dnl + dnl See if gettimeofday clobbers the static buffer that localtime uses dnl for its return value. The gettimeofday function from Mac OS X 10.0.4 dnl (i.e., Darwin 1.3.7) has this problem. @@ -88,70 +48,54 @@ dnl dnl If it does, then arrange to use gettimeofday and localtime only via dnl the wrapper functions that work around the problem. -AC_DEFUN([AC_FUNC_GETTIMEOFDAY_CLOBBER], +AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], [ - AC_REQUIRE([AC_HEADER_TIME]) - AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], - [jm_cv_func_gettimeofday_clobber], - [AC_TRY_RUN([ -#include -#include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif + AC_REQUIRE([gl_HEADER_SYS_TIME_H]) -#include - -int -main () -{ - time_t t = 0; - struct tm *lt; - struct tm saved_lt; - struct timeval tv; - lt = localtime (&t); - saved_lt = *lt; - gettimeofday (&tv, NULL); - if (memcmp (lt, &saved_lt, sizeof (struct tm)) != 0) - exit (1); + AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], + [gl_cv_func_gettimeofday_clobber], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + #include + ]], + [[ + time_t t = 0; + struct tm *lt; + struct tm saved_lt; + struct timeval tv; + lt = localtime (&t); + saved_lt = *lt; + gettimeofday (&tv, NULL); + return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0; + ]])], + [gl_cv_func_gettimeofday_clobber=no], + [gl_cv_func_gettimeofday_clobber=yes], + dnl When crosscompiling, assume it is broken. + [gl_cv_func_gettimeofday_clobber=yes])]) - exit (0); -} - ], - jm_cv_func_gettimeofday_clobber=no, - jm_cv_func_gettimeofday_clobber=yes, - dnl When crosscompiling, assume it is broken. - jm_cv_func_gettimeofday_clobber=yes) - ]) - if test $jm_cv_func_gettimeofday_clobber = yes; then - gl_GETTIMEOFDAY_REPLACE_LOCALTIME - fi + if test $gl_cv_func_gettimeofday_clobber = yes; then + REPLACE_GETTIMEOFDAY=1 + SYS_TIME_H=sys/time.h + gl_GETTIMEOFDAY_REPLACE_LOCALTIME + AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1, + [Define if gettimeofday clobbers the localtime buffer.]) + fi ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ AC_LIBOBJ(gettimeofday) gl_PREREQ_GETTIMEOFDAY - AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1, - [Define if gettimeofday clobbers the localtime buffer.]) AC_DEFINE([gmtime], [rpl_gmtime], [Define to rpl_gmtime if the replacement function should be used.]) AC_DEFINE([localtime], [rpl_localtime], [Define to rpl_localtime if the replacement function should be used.]) - AC_DEFINE([tzset], [rpl_tzset], - [Define to rpl_tzset if the replacement function should be used.]) ]) # Prerequisites of lib/gettimeofday.c. AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [ - AC_REQUIRE([AC_HEADER_TIME]) AC_CHECK_HEADERS([sys/timeb.h]) AC_CHECK_FUNCS([_ftime]) ])