From dc3ed353132f853dc3ddee410a4f9423534a8289 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 14 Oct 2006 12:01:44 +0000 Subject: [PATCH] Define HAVE_STRUCT_TIMEVAL as appropriate for platforms that lack autotools support --- ares/Makefile.dj | 2 ++ ares/Makefile.netware | 3 ++- ares/config-win32.h | 19 +++++++++++++++++++ lib/Makefile.netware | 3 ++- lib/config-amigaos.h | 1 + lib/config-mac.h | 2 ++ lib/config-riscos.h | 3 +++ lib/config-tpf.h | 3 +++ lib/config-win32.h | 6 ++++++ lib/config-win32ce.h | 6 ++++++ lib/config.dos | 1 + src/Makefile.netware | 1 + src/config-amigaos.h | 1 + src/config-mac.h | 5 +++++ src/config-riscos.h | 3 +++ src/config-win32.h | 31 +++++++++++++++++++++++++++++++ 16 files changed, 88 insertions(+), 2 deletions(-) diff --git a/ares/Makefile.dj b/ares/Makefile.dj index bba45eb61..0524bd62e 100644 --- a/ares/Makefile.dj +++ b/ares/Makefile.dj @@ -13,6 +13,8 @@ CFLAGS = -O2 -Wall -DWATT32 -Dselect=select_s -DHAVE_AF_INET6 \ -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET -DHAVE_STRUCT_IN6_ADDR \ -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \ -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 \ + -DHAVE_SYS_TIME_H -DHAVE_TIME_H \ + -DTIME_WITH_SYS_TIME -DHAVE_STRUCT_TIMEVAL \ -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID -I$(WATT32_ROOT)/inc LDFLAGS = -s diff --git a/ares/Makefile.netware b/ares/Makefile.netware index 78e6930e2..b20497f9a 100644 --- a/ares/Makefile.netware +++ b/ares/Makefile.netware @@ -316,9 +316,10 @@ config.h: Makefile.netware @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ @echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@ @echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@ @echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_TIMEVAL 1$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@ ifdef NW_WINSOCK diff --git a/ares/config-win32.h b/ares/config-win32.h index 8e68f9825..0cd626ff4 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -29,6 +29,12 @@ #define HAVE_GETOPT_H 1 #endif +/* Define if you have the header file */ +/* #define HAVE_SYS_TIME_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 + /* Define if you have the header file. */ #if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \ defined(__POCC__) @@ -47,6 +53,16 @@ /* Define if you have the header file. */ #define HAVE_WS2TCPIP_H 1 +/* ---------------------------------------------------------------- */ +/* OTHER HEADER INFO */ +/* ---------------------------------------------------------------- */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +/* #define TIME_WITH_SYS_TIME 1 */ + /* ---------------------------------------------------------------- */ /* FUNCTIONS */ /* ---------------------------------------------------------------- */ @@ -121,6 +137,9 @@ /* Define this if you have struct sockaddr_storage */ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 +/* Define this if you have struct timeval */ +#define HAVE_STRUCT_TIMEVAL 1 + /* ---------------------------------------------------------------- */ /* IPV6 COMPATIBILITY */ /* ---------------------------------------------------------------- */ diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 291b24ff6..d9489c4c0 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -359,9 +359,10 @@ config.h: Makefile.netware @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ @echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@ @echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@ @echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_TIMEVAL 1$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@ ifdef DISABLE_LDAP diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 88e8f5c97..3d880003d 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -39,6 +39,7 @@ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 #define HAVE_STRSTR 1 +#define HAVE_STRUCT_TIMEVAL 1 #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_SOCKET_H 1 #define HAVE_SYS_SOCKIO_H 1 diff --git a/lib/config-mac.h b/lib/config-mac.h index 35eeef6cc..afca67775 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -15,6 +15,7 @@ #define HAVE_TIME_H 1 #define HAVE_STDLIB_H 1 #define HAVE_UTIME_H 1 +#define HAVE_SYS_TIME_H 1 #define TIME_WITH_SYS_TIME 1 @@ -27,6 +28,7 @@ #define HAVE_MEMCPY 1 #define HAVE_SELECT 1 #define HAVE_SOCKET 1 +#define HAVE_STRUCT_TIMEVAL 1 //#define HAVE_STRICMP 1 #define HAVE_SIGACTION 1 diff --git a/lib/config-riscos.h b/lib/config-riscos.h index bb4bafba5..e2877df75 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -119,6 +119,9 @@ /* Define if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY +/* Define if you have the `timeval' struct. */ +#define HAVE_STRUCT_TIMEVAL + /* Define if you have the `inet_addr' function. */ #undef HAVE_INET_ADDR diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 5deb112d2..6b1accc79 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -475,6 +475,9 @@ /* if struct sockaddr_storage is defined */ /* #undef HAVE_STRUCT_SOCKADDR_STORAGE */ +/* Define this if you have struct timeval */ +#define HAVE_STRUCT_TIMEVAL 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_FILIO_H 1 diff --git a/lib/config-win32.h b/lib/config-win32.h index 33322c839..871e6bef6 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -81,6 +81,9 @@ /* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define if you have the header file */ +/* #define HAVE_SYS_TIME_H 1 */ + /* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 @@ -335,6 +338,9 @@ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #endif +/* Define this if you have struct timeval */ +#define HAVE_STRUCT_TIMEVAL 1 + /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index f9796a302..21afc4268 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -75,6 +75,9 @@ /* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define if you have the header file */ +/* #define HAVE_SYS_TIME_H 1 */ + /* Define if you have the header file. */ /* #define HAVE_SYS_TYPES_H 1 */ @@ -307,6 +310,9 @@ /* Define this if you have struct sockaddr_storage */ /* #define HAVE_STRUCT_SOCKADDR_STORAGE 1 */ +/* Define this if you have struct timeval */ +#define HAVE_STRUCT_TIMEVAL 1 + /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ diff --git a/lib/config.dos b/lib/config.dos index a5df499c0..405399f87 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -56,6 +56,7 @@ #define HAVE_STRICMP 1 #define HAVE_STRSTR 1 #define HAVE_STRTOLL 1 +#define HAVE_STRUCT_TIMEVAL 1 #define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_SOCKET_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/src/Makefile.netware b/src/Makefile.netware index c0b2007dd..a04043b5b 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -345,6 +345,7 @@ config.h: Makefile.netware @echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@ @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@ @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ + @echo $(DL)#define HAVE_STRUCT_TIMEVAL 1$(DL) >> $@ ifdef ENABLE_IPV6 @echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@ endif diff --git a/src/config-amigaos.h b/src/config-amigaos.h index e067c9662..e58af4df7 100644 --- a/src/config-amigaos.h +++ b/src/config-amigaos.h @@ -17,6 +17,7 @@ #define HAVE_SYS_TIME_H 1 #define HAVE_TIME_H 1 #define TIME_WITH_SYS_TIME 1 +#define HAVE_STRUCT_TIMEVAL 1 #if 0 # define HAVE_TERMIOS_H 1 diff --git a/src/config-mac.h b/src/config-mac.h index e1806d5c6..2697afe0e 100644 --- a/src/config-mac.h +++ b/src/config-mac.h @@ -10,6 +10,11 @@ #define HAVE_UTIME 1 #define HAVE_FTRUNCATE 1 +#define HAVE_TIME_H 1 +#define HAVE_SYS_TIME_H 1 +#define TIME_WITH_SYS_TIME 1 +#define HAVE_STRUCT_TIMEVAL 1 + #define main(x,y) curl_main(x,y) /* we provide our own strdup prototype */ diff --git a/src/config-riscos.h b/src/config-riscos.h index ceab565c1..90e2d9f2e 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -125,6 +125,9 @@ /* Define if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY +/* Define if you have the `timeval' struct. */ +#define HAVE_STRUCT_TIMEVAL + /* Define if you have the `inet_addr' function. */ #undef HAVE_INET_ADDR diff --git a/src/config-win32.h b/src/config-win32.h index ab60a2e1e..fd9d1b81d 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -21,6 +21,15 @@ /* Define if you have the header file. */ #define HAVE_LOCALE_H 1 +/* Define if you have the header file */ +/* #define HAVE_SYS_TIME_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 + /* Define if you have the header file. */ #ifndef __BORLANDC__ #define HAVE_SYS_UTIME_H 1 @@ -43,6 +52,16 @@ /* Define if you have the header file. */ #define HAVE_WS2TCPIP_H 1 +/* ---------------------------------------------------------------- */ +/* OTHER HEADER INFO */ +/* ---------------------------------------------------------------- */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +/* #define TIME_WITH_SYS_TIME 1 */ + /* ---------------------------------------------------------------- */ /* FUNCTIONS */ /* ---------------------------------------------------------------- */ @@ -64,6 +83,18 @@ #define HAVE_UTIME 1 #endif +/* ---------------------------------------------------------------- */ +/* STRUCT RELATED */ +/* ---------------------------------------------------------------- */ + +/* Define this if you have struct sockaddr_storage */ +#ifndef __SALFORDC__ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 +#endif + +/* Define this if you have struct timeval */ +#define HAVE_STRUCT_TIMEVAL 1 + /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ /* ---------------------------------------------------------------- */