Commit 61a96709 authored by Yang Tse's avatar Yang Tse
Browse files

John E. Malmberg noticed that the configure script was failing to detect the 

timeval struct on VMS when building with _XOPEN_SOURCE_EXTENDED undefined due
to definition taking place in socket.h instead of time.h
parent c0e004ec

acinclude.m4

+4 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ 
  AC_REQUIRE([AC_HEADER_TIME])dnl

  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl

  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl

  AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)

  AC_CHECK_HEADERS(sys/types.h sys/time.h time.h sys/socket.h)

  AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[
@@ -1882,6 +1882,9 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ 
#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

      ]],[[

        struct timeval ts;

ares/acinclude.m4

+4 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ 
  AC_REQUIRE([AC_HEADER_TIME])dnl

  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl

  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl

  AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)

  AC_CHECK_HEADERS(sys/types.h sys/time.h time.h sys/socket.h)

  AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[
@@ -1350,6 +1350,9 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ 
#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

      ]],[[

        struct timeval ts;