(GETTIMEOFDAY_ONE_ARGUMENT): Fix in case _XOPEN_SOURCE is defined.

diff --git a/configure.in b/configure.in
index d7c7af312b563abc040b76d18d9645ce8ed36e8c..91700caaf8a47d766844264ead2657ad5f7df80a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1867,7 +1867,7 @@ AC_CHECK_FUNCS(gettimeofday gethostname getdomainname dup2 \
 rename closedir mkdir rmdir sysinfo \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
-utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo \
+utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
 __fpending getloadavg mblen mbrlen strsignal setitimer ualarm)
 
 AC_FUNC_MKTIME
@@ -1978,15 +1978,30 @@ AC_TRY_LINK([
 #else
 #include <time.h>
 #endif
-#endif
-  ],
-  [
-  struct timeval time;
-  struct timezone dummy;
-  gettimeofday (&time, &dummy);
-],
+#endif],
+  [struct timeval time;
+   struct timezone dummy;
+   gettimeofday (&time, &dummy);],
   emacs_cv_gettimeofday_two_arguments=yes,
-  emacs_cv_gettimeofday_two_arguments=no))
+dnl The above test loses, e.g. on OSF 5.0 with _XOPEN_SOURCE defined by
+dnl AC_SYS_LARGEFILE, because struct timezone is hidden.
+dnl Try again assuming a void * second arg.
+  AC_TRY_LINK([
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif],
+    [struct timeval time;
+     int dummy;
+     gettimeofday (&time, &dummy);], 
+    emacs_cv_gettimeofday_two_arguments=yes,
+    emacs_cv_gettimeofday_two_arguments=no)))
   if test $emacs_cv_gettimeofday_two_arguments = no; then
     AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)
   fi