From 9c25b58b4c8b7b0af1035a50c4d7b19f63766bf9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Feb 2002 14:32:28 +0000 Subject: moved the config-*.h files from root to the lib/ dir --- lib/config-win32.h | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 lib/config-win32.h (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h new file mode 100644 index 000000000..d82c59e7d --- /dev/null +++ b/lib/config-win32.h @@ -0,0 +1,218 @@ +/* config.h. Generated automatically by configure. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ + +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +/* #undef _ALL_SOURCE */ +#endif + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ + +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 + +/* Define as the return type of signal handlers (int or void). */ +/*#define RETSIGTYPE void */ + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define this to 'int' if ssize_t is not an available typedefed type */ +#define ssize_t int + +/* Define this to 'int' if socklen_t is not an available typedefed type */ +#define socklen_t int + +/* 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 */ + +/* Define cpu-machine-OS */ +#define OS "win32" + +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 16 + +/* The number of bytes in a long long. */ +/* #define SIZEOF_LONG_LONG 8 */ + +/* Define if you have the gethostbyaddr function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define if you have the getpass function. */ +/*#define HAVE_GETPASS 1*/ + +/* Define if you have the getservbyname function. */ +#define HAVE_GETSERVBYNAME 1 + +/* Define if you have the gettimeofday function. */ +/* #define HAVE_GETTIMEOFDAY 1 */ + +/* Define if you have the inet_addr function. */ +#define HAVE_INET_ADDR 1 + +/* Define if you have the inet_ntoa function. */ +#define HAVE_INET_NTOA 1 + +/* Define if you have the perror function. */ +#define HAVE_PERROR 1 + +/* Define if you have the select function. */ +#define HAVE_SELECT 1 + +/* Define if you have the socket function. */ +#define HAVE_SOCKET 1 + +/* Define if you have the strcasecmp function. */ +/*#define HAVE_STRCASECMP 1*/ + +/* Define if you have the stricmp function. */ +#define HAVE_STRICMP 1 + +/* Define if you have the strdup function. */ +#define HAVE_STRDUP 1 + +/* Define if you have the strftime function. */ +#define HAVE_STRFTIME 1 + +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the tcgetattr function. */ +/*#define HAVE_TCGETATTR 1*/ + +/* Define if you have the tcsetattr function. */ +/*#define HAVE_TCSETATTR 1*/ + +/* Define if you have the uname function. */ +/*#define HAVE_UNAME 1*/ + +/* Define if you have the header file. */ +/*#define HAVE_ALLOCA_H 1*/ + +/* Define if you have the malloc.h file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_CRYPTO_H */ + +/* Define if you have the header file. */ +/*#define HAVE_DLFCN_H 1*/ + +/* Define if you have the header file. */ +/* #undef HAVE_ERR_H */ + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define if you have the header file. */ +/*#define HAVE_NETINET_IN_H 1*/ + +/* Define if you have the header file. */ +/*#define HAVE_SGTTY_H 1*/ + +/* Define if you have the header file. */ +/* #undef HAVE_SSL_H */ + +/* Define if you have the header file. */ +/*#define HAVE_SYS_PARAM_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define if you have the header file. */ +/*#define HAVE_SYS_SOCKET_H 1*/ + +/* Define if you have the header file. */ +#define HAVE_SYS_SOCKIO_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +#define HAVE_TERMIO_H 1 + +/* Define if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Name of package */ +#define PACKAGE "curl" + +/* Define if you have the header file. */ +#define HAVE_IO_H 1 + +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINSOCK_H 1 + +/* Define if you have the closesocket function. */ +#define HAVE_CLOSESOCKET 1 + +/* Define if you have the setvbuf function. */ +#define HAVE_SETVBUF 1 + +/* Define if you have the RAND_screen function when using SSL */ +#define HAVE_RAND_SCREEN 1 + +/* Define this to if in_addr_t is not an available typedefed type */ +#define in_addr_t unsigned long + +/************************************************* + * This section is for compiler specific defines.* + *************************************************/ +#ifdef MINGW32 /* Borland and MS don't have this */ + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +#endif + +/************************************************** + *This is to eliminate the warnings when compiled * + * using MS VC++ compiler * + **************************************************/ +#ifdef _MSC_VER + +#pragma warning (disable: 4244) /* truncation from 'const int' to 'char' */ +#pragma warning (disable: 4127) /* conditional expression is constant */ +#pragma warning (disable: 4706) /* assignment within conditional expression */ +#pragma warning (disable: 4761) /* integral size mismatch in argument */ +#pragma warning (disable: 4101) /* unreferenced local variable */ +#pragma warning (disable: 4131) /* uses old-style declarator */ +#pragma warning (disable: 4057) /* const char *' differs in indirection to + slightly different base types from + 'unsigned char [x] */ +#pragma warning (disable: 4100) /* unreferenced formal parameter */ +#pragma warning (disable: 4055) /* type cast' : from data pointer 'void *' to + function pointer + 'void *(__cdecl *)(char *,int ) */ +#pragma warning (disable: 4701) /* local variable may be used without having + been initialized */ +#pragma warning (disable: 4715) /* ToHour' : not all control paths return a + value */ +#endif -- cgit v1.2.1 From b79f01caf3af991043b984d07956b867480006cd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 5 Jun 2002 14:14:54 +0000 Subject: set HAVE_RAND_STATUS too --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index d82c59e7d..6aa7f6d1a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -179,6 +179,9 @@ /* Define if you have the RAND_screen function when using SSL */ #define HAVE_RAND_SCREEN 1 +/* Define if you have the `RAND_status' function. */ +#define HAVE_RAND_STATUS 1 + /* Define this to if in_addr_t is not an available typedefed type */ #define in_addr_t unsigned long -- cgit v1.2.1 From 35153eb52487219ef2bce9b7cd57db38909cab44 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 20 Aug 2002 11:42:35 +0000 Subject: windows has stdlib.h --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6aa7f6d1a..04c9ca01e 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -170,6 +170,9 @@ /* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + /* Define if you have the closesocket function. */ #define HAVE_CLOSESOCKET 1 -- cgit v1.2.1 From a72d789b08cfca5727c03f3af953379f75033298 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 20 Aug 2002 11:46:48 +0000 Subject: Added three more pragmas for MSVC++ compiles. We *really* need these sorted out. I'd prefer to have them all removed and the actual code corrected instead of just diabling the warnings and pretending that they don't exist. --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 04c9ca01e..5cf10514d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -221,4 +221,7 @@ been initialized */ #pragma warning (disable: 4715) /* ToHour' : not all control paths return a value */ +#pragma warning (disable: 4115) /* warning C4115: '_RPC_ASYNC_STATE' : named + type definition in parentheses */ +#pragma warning (disable: 4206) /* this does what? */ #endif -- cgit v1.2.1 From 982c5460f0eb521ce4f9526535e9d122fe8755bd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 26 Aug 2002 17:20:29 +0000 Subject: Andrew Francis removed the need for/use of MSVC pragmas --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5cf10514d..1e0622941 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -202,7 +202,7 @@ *This is to eliminate the warnings when compiled * * using MS VC++ compiler * **************************************************/ -#ifdef _MSC_VER +#if 0 #pragma warning (disable: 4244) /* truncation from 'const int' to 'char' */ #pragma warning (disable: 4127) /* conditional expression is constant */ -- cgit v1.2.1 From 749f5387c19449209615b282ac738032f2a890e7 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 14 Oct 2003 12:00:45 +0000 Subject: Gisle Vanem's IPv6-on-Windows patch applied! --- lib/config-win32.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 1e0622941..c24e8b7b6 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -27,7 +27,9 @@ #define ssize_t int /* Define this to 'int' if socklen_t is not an available typedefed type */ +#if !defined(ENABLE_IPV6) && !defined(USE_SSLEAY) #define socklen_t int +#endif /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -98,6 +100,9 @@ /* Define if you have the uname function. */ /*#define HAVE_UNAME 1*/ +/* Define if you have utime() */ +#define HAVE_UTIME 1 + /* Define if you have the header file. */ /*#define HAVE_ALLOCA_H 1*/ @@ -105,7 +110,7 @@ #define HAVE_MALLOC_H 1 /* Define if you have the header file. */ -#define HAVE_ARPA_INET_H 1 +/* #define HAVE_ARPA_INET_H 1 */ /* Define if you have the header file. */ /* #undef HAVE_CRYPTO_H */ @@ -123,7 +128,7 @@ /* #undef HAVE_GETOPT_H */ /* Define if you have the header file. */ -#define HAVE_NETDB_H 1 +/* #define HAVE_NETDB_H 1 */ /* Define if you have the header file. */ /*#define HAVE_NETINET_IN_H 1*/ @@ -144,19 +149,22 @@ /*#define HAVE_SYS_SOCKET_H 1*/ /* Define if you have the header file. */ -#define HAVE_SYS_SOCKIO_H 1 +/* #define HAVE_SYS_SOCKIO_H 1 */ /* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define if you have the header file */ +#define HAVE_SYS_UTIME_H 1 + /* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define if you have the header file. */ -#define HAVE_TERMIO_H 1 +/* #define HAVE_TERMIO_H 1 */ /* Define if you have the header file. */ -#define HAVE_TERMIOS_H 1 +/* #define HAVE_TERMIOS_H 1 */ /* Name of package */ #define PACKAGE "curl" @@ -170,6 +178,12 @@ /* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 +/* Define if you have the header file. */ +#define HAVE_WINSOCK2_H 1 + +/* Define if you have the header file. */ +#define HAVE_WS2TCPIP_H 1 + /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -191,7 +205,7 @@ /************************************************* * This section is for compiler specific defines.* *************************************************/ -#ifdef MINGW32 /* Borland and MS don't have this */ +#if defined(MINGW32) || defined(__WATCOMC__) /* Borland and MS don't have this */ /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 -- cgit v1.2.1 From aff9a817b4b970c06b810c88383efce4400d1e0b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 18 Dec 2003 08:56:20 +0000 Subject: David Byron's fix to make libcurl build fine with both .NET and VC6 version of MSVC --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c24e8b7b6..6d60735a7 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -27,7 +27,7 @@ #define ssize_t int /* Define this to 'int' if socklen_t is not an available typedefed type */ -#if !defined(ENABLE_IPV6) && !defined(USE_SSLEAY) +#if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY)) #define socklen_t int #endif -- cgit v1.2.1 From 9a48ca69fcf385d5f7822dfde62243faf19ba6f5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 22 Jan 2004 14:25:19 +0000 Subject: Gisle Vanem's fix, mingw as strtoll --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6d60735a7..cb6017ae0 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -91,6 +91,11 @@ /* Define if you have the strstr function. */ #define HAVE_STRSTR 1 +/* Define if you have the strtoll function. */ +#ifdef MINGW32 +#define HAVE_STRTOLL 1 +#endif + /* Define if you have the tcgetattr function. */ /*#define HAVE_TCGETATTR 1*/ -- cgit v1.2.1 From 7d844c430cf66d0ecde83a749a266e784a67db26 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 20 Feb 2004 16:41:50 +0000 Subject: Gisle Vanem brings name resolving timeout possibilities to windows people. This works by magicly starting up a new thread that can be killed when the timeout is reached. testtesttest! --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index cb6017ae0..b37f55257 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -117,6 +117,9 @@ /* Define if you have the header file. */ /* #define HAVE_ARPA_INET_H 1 */ +/* Define if you have the header file. */ +#define HAVE_ASSERT_H 1 + /* Define if you have the header file. */ /* #undef HAVE_CRYPTO_H */ -- cgit v1.2.1 From 2911e63bc204a85c854b0bfc0f685926b2201dc2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 23 Feb 2004 11:59:28 +0000 Subject: curl_off_t is 8 bytes big on windows --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index b37f55257..63847426d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -31,6 +31,9 @@ #define socklen_t int #endif +/* The size of a `curl_off_t', as computed by sizeof. */ +#define SIZEOF_CURL_OFF_T 8 + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.1 From 4515d06465da15340c56d5b4f14ab4950fd59baa Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 26 Feb 2004 16:23:28 +0000 Subject: David Byron's fixes to make the latest curl build fine under MSVC 6. --- lib/config-win32.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 63847426d..d6665896d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -32,6 +32,10 @@ #endif /* The size of a `curl_off_t', as computed by sizeof. */ +#ifdef SIZEOF_CURL_OFF_T +#undef SIZEOF_CURL_OFF_T +#endif + #define SIZEOF_CURL_OFF_T 8 /* Define if you have the ANSI C header files. */ -- cgit v1.2.1 From bab9f532f2030cf2e94a5366e732b8b51d52791a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Mar 2004 08:35:33 +0000 Subject: added HAVE_IOCTLSOCKET here --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index d6665896d..771f65d9b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -217,6 +217,9 @@ /* Define this to if in_addr_t is not an available typedefed type */ #define in_addr_t unsigned long +/* use ioctlsocket() for non-blocking sockets */ +#define HAVE_IOCTLSOCKET + /************************************************* * This section is for compiler specific defines.* *************************************************/ -- cgit v1.2.1 From 0d1f80ccb508460788f371b64f1d7b0da99e9e8b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 Mar 2004 07:04:31 +0000 Subject: removed the #if 0'ed pragmas that disable warnings on msvc --- lib/config-win32.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 771f65d9b..c734d7c48 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -229,31 +229,3 @@ #define HAVE_UNISTD_H 1 #endif - -/************************************************** - *This is to eliminate the warnings when compiled * - * using MS VC++ compiler * - **************************************************/ -#if 0 - -#pragma warning (disable: 4244) /* truncation from 'const int' to 'char' */ -#pragma warning (disable: 4127) /* conditional expression is constant */ -#pragma warning (disable: 4706) /* assignment within conditional expression */ -#pragma warning (disable: 4761) /* integral size mismatch in argument */ -#pragma warning (disable: 4101) /* unreferenced local variable */ -#pragma warning (disable: 4131) /* uses old-style declarator */ -#pragma warning (disable: 4057) /* const char *' differs in indirection to - slightly different base types from - 'unsigned char [x] */ -#pragma warning (disable: 4100) /* unreferenced formal parameter */ -#pragma warning (disable: 4055) /* type cast' : from data pointer 'void *' to - function pointer - 'void *(__cdecl *)(char *,int ) */ -#pragma warning (disable: 4701) /* local variable may be used without having - been initialized */ -#pragma warning (disable: 4715) /* ToHour' : not all control paths return a - value */ -#pragma warning (disable: 4115) /* warning C4115: '_RPC_ASYNC_STATE' : named - type definition in parentheses */ -#pragma warning (disable: 4206) /* this does what? */ -#endif -- cgit v1.2.1 From f9e1f32adb36311f003a92415d928d72347b6a92 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 Mar 2004 08:14:22 +0000 Subject: make windows builds use the OS string "i386-pc-win32" instead of just "win32" to make it more like other OS strings --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c734d7c48..7eca94e44 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -45,7 +45,7 @@ /* #define TIME_WITH_SYS_TIME 1 */ /* Define cpu-machine-OS */ -#define OS "win32" +#define OS "i386-pc-win32" /* The number of bytes in a long double. */ #define SIZEOF_LONG_DOUBLE 16 -- cgit v1.2.1 From 938a72b2dba019eb81d942fbe85cf401a7014d21 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 2 Jun 2004 11:36:07 +0000 Subject: Gisle's adjustments to allow building with lcc-win32 --- lib/config-win32.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 7eca94e44..b1463741e 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -1,6 +1,9 @@ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ +#ifndef __CONFIG_WIN32_H +#define __CONFIG_WIN32_H + /* Define if on AIX 3. System headers sometimes define this. We just want to avoid a redefinition error message. */ @@ -223,9 +226,12 @@ /************************************************* * This section is for compiler specific defines.* *************************************************/ -#if defined(MINGW32) || defined(__WATCOMC__) /* Borland and MS don't have this */ +/* Borland and MS don't have this */ +#if defined(MINGW32) || defined(__WATCOMC__) || defined(__LCC__) /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 #endif + +#endif -- cgit v1.2.1 From e7dbbd16a5ba5045b133cca26359683ac458f98b Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Thu, 24 Jun 2004 13:49:14 +0000 Subject: fixed the MSVC build. --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index b1463741e..4336e19e0 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -232,6 +232,11 @@ /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 +#else + +/* MSVC needs an underscore */ +#define snprintf _snprintf + #endif #endif -- cgit v1.2.1 From 5b55dcbfbbeca0cc283fe5ea8422bd1d95af93cd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 24 Jun 2004 14:34:13 +0000 Subject: reverted bad win32 fix --- lib/config-win32.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 4336e19e0..e14764e1c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -234,9 +234,6 @@ #else -/* MSVC needs an underscore */ -#define snprintf _snprintf - #endif #endif -- cgit v1.2.1 From 1318760ad22ccd5e8e52a4bb5e7ac91825df063c Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Thu, 15 Jul 2004 01:08:08 +0000 Subject: Gisle's fix to support Borland builds again. --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index e14764e1c..3aa27b639 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -39,7 +39,12 @@ #undef SIZEOF_CURL_OFF_T #endif +/* Borland lacks _lseeki64(), so we don't support >2GB files */ +#ifdef __BORLANDC__ +#define SIZEOF_CURL_OFF_T 4 +#else #define SIZEOF_CURL_OFF_T 8 +#endif /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.1 From c3ecd552f5c89998052f83814b199b263f34f517 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sun, 14 Nov 2004 13:49:09 +0000 Subject: Borland doesn't have nor utime(). --- lib/config-win32.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 3aa27b639..820e9b5b9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -41,7 +41,7 @@ /* Borland lacks _lseeki64(), so we don't support >2GB files */ #ifdef __BORLANDC__ -#define SIZEOF_CURL_OFF_T 4 +#define SIZEOF_CURL_OFF_T 4 #else #define SIZEOF_CURL_OFF_T 8 #endif @@ -121,7 +121,9 @@ /*#define HAVE_UNAME 1*/ /* Define if you have utime() */ +#ifndef __BORLANDC__ #define HAVE_UTIME 1 +#endif /* Define if you have the header file. */ /*#define HAVE_ALLOCA_H 1*/ @@ -178,7 +180,9 @@ #define HAVE_SYS_STAT_H 1 /* Define if you have the header file */ +#ifndef __BORLANDC__ #define HAVE_SYS_UTIME_H 1 +#endif /* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -- cgit v1.2.1 From fe5979cfdba009b356bdffafcb9b46ad0570abf1 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 6 Dec 2004 14:43:04 +0000 Subject: Replace MINGW32 with built-in __MINGW32__. --- lib/config-win32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 820e9b5b9..96b0e18fa 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -107,7 +107,7 @@ #define HAVE_STRSTR 1 /* Define if you have the strtoll function. */ -#ifdef MINGW32 +#ifdef __MINGW32__ #define HAVE_STRTOLL 1 #endif @@ -236,7 +236,7 @@ * This section is for compiler specific defines.* *************************************************/ /* Borland and MS don't have this */ -#if defined(MINGW32) || defined(__WATCOMC__) || defined(__LCC__) +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 -- cgit v1.2.1 From 321511a5befd6791683f34a39af381d5153ee236 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Fri, 17 Dec 2004 19:57:50 +0000 Subject: Watcom has strtoll(). --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 96b0e18fa..a12394f2c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -107,7 +107,7 @@ #define HAVE_STRSTR 1 /* Define if you have the strtoll function. */ -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__WATCOMC__) #define HAVE_STRTOLL 1 #endif -- cgit v1.2.1 From 205f8b266cfeedc18d4fad134b7fbd6d68c14ef3 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 11 Mar 2005 05:28:07 +0000 Subject: Fixed LDAP library file name bug (KNOWN_BUGS #1). configure now auto-detects the correct dynamic library names by default, and provides override switches --with-ldap-lib, --with-lber-lib and --without-lber-lib. Added CURL_DISABLE_LDAP to platform-specific config files to disable LDAP support on those platforms that probably don't have dynamic OpenLDAP libraries available to avoid compile errors. --- lib/config-win32.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index a12394f2c..e17ef98ae 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -232,6 +232,12 @@ /* use ioctlsocket() for non-blocking sockets */ #define HAVE_IOCTLSOCKET +/* lber dynamic library file */ +/* #undef DL_LBER_FILE */ + +/* ldap dynamic library file */ +#define DL_LDAP_FILE "wldap32.dll" + /************************************************* * This section is for compiler specific defines.* *************************************************/ -- cgit v1.2.1 From a8ff0a21bf88f1cbfd6fa38683876dc95a96f1f3 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 24 Apr 2005 22:25:04 +0000 Subject: Based on feedback from Cory Nelson, I added some preprocessor magic in */setup.h and */config-win32.h to build fine with VS2005 on x64. --- lib/config-win32.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index e17ef98ae..3a6f65716 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -235,6 +235,10 @@ /* lber dynamic library file */ /* #undef DL_LBER_FILE */ +/* Defines set for VS2005 to _not_ decprecate a few functions we use. */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE + /* ldap dynamic library file */ #define DL_LDAP_FILE "wldap32.dll" -- cgit v1.2.1 From a00f9b093c4bb876deabdae789f3c27c79f10350 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 12 May 2005 12:53:02 +0000 Subject: spell --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 3a6f65716..b0f4f9e0d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -235,7 +235,7 @@ /* lber dynamic library file */ /* #undef DL_LBER_FILE */ -/* Defines set for VS2005 to _not_ decprecate a few functions we use. */ +/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ #define _CRT_SECURE_NO_DEPRECATE #define _CRT_NONSTDC_NO_DEPRECATE -- cgit v1.2.1 From d4714517c0fc1458c138512d77a285735546dc8f Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sun, 13 Nov 2005 13:32:19 +0000 Subject: Add HAVE_STRUCT_SOCKADDR_STORAGE. My mistake; WinCE has it's own config-file. --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index b0f4f9e0d..5e9e8057c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -232,6 +232,9 @@ /* use ioctlsocket() for non-blocking sockets */ #define HAVE_IOCTLSOCKET +/* Define this if you have struct sockaddr_storage */ +#define HAVE_STRUCT_SOCKADDR_STORAGE + /* lber dynamic library file */ /* #undef DL_LBER_FILE */ -- cgit v1.2.1 From 2f684351bfd4c02f72a91434437ce2566d4f814b Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Thu, 24 Nov 2005 20:33:38 +0000 Subject: Changes for OpenWatcom 1.4. --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5e9e8057c..030b82dfc 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -27,7 +27,10 @@ /* #undef size_t */ /* Define this to 'int' if ssize_t is not an available typedefed type */ +#if defined(__WATCOMC__) && (__WATCOMC__ >= 1240) +#else #define ssize_t int +#endif /* Define this to 'int' if socklen_t is not an available typedefed type */ #if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY)) -- cgit v1.2.1 From e105d5c28f3f6c7034a8da2682bbc662ad6c15e1 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 16 Dec 2005 20:55:07 +0000 Subject: 'Fix' windows builds --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 030b82dfc..81216461d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -205,6 +205,9 @@ /* Define if you have the header file. */ #define HAVE_TIME_H 1 +/* Define if you have the header file. */ +#define HAVE_WINDOWS_H 1 + /* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 -- cgit v1.2.1 From 23b34744d9d3ec2623b5f6be5051ab7e094f63e8 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 17 Dec 2005 21:20:35 +0000 Subject: Cleanup --- lib/config-win32.h | 343 ++++++++++++++++++++++++++++------------------------- 1 file changed, 184 insertions(+), 159 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 81216461d..f41f33f5c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -1,68 +1,127 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +#ifndef __LIB_CONFIG_WIN32_H +#define __LIB_CONFIG_WIN32_H -#ifndef __CONFIG_WIN32_H -#define __CONFIG_WIN32_H +/* ================================================================ */ +/* lib/config-win32.h - Hand crafted config file for windows */ +/* ================================================================ */ -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif +/* ---------------------------------------------------------------- */ +/* HEADER FILES */ +/* ---------------------------------------------------------------- */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define if you have the header file. */ +/* #define HAVE_ALLOCA_H 1 */ -/* Define if you don't have vprintf but do have _doprnt. */ -/* #undef HAVE_DOPRNT */ +/* Define if you have the header file. */ +/* #define HAVE_ARPA_INET_H 1 */ -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 +/* Define if you have the header file. */ +#define HAVE_ASSERT_H 1 -/* Define as the return type of signal handlers (int or void). */ -/*#define RETSIGTYPE void */ +/* Define if you have the header file. */ +/* #undef HAVE_CRYPTO_H */ -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define if you have the header file. */ +/* #define HAVE_DLFCN_H 1 */ -/* Define this to 'int' if ssize_t is not an available typedefed type */ -#if defined(__WATCOMC__) && (__WATCOMC__ >= 1240) -#else -#define ssize_t int -#endif +/* Define if you have the header file. */ +/* #undef HAVE_ERR_H */ -/* Define this to 'int' if socklen_t is not an available typedefed type */ -#if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY)) -#define socklen_t int -#endif +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 -/* The size of a `curl_off_t', as computed by sizeof. */ -#ifdef SIZEOF_CURL_OFF_T -#undef SIZEOF_CURL_OFF_T +/* Define if you have the header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define if you have the header file. */ +#define HAVE_IO_H 1 + +/* Define if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_NETDB_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_NETINET_IN_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SGTTY_H 1*/ + +/* Define if you have the header file. */ +/* #undef HAVE_SSL_H */ + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_SYS_PARAM_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SOCKET_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SOCKIO_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file */ +#ifndef __BORLANDC__ +#define HAVE_SYS_UTIME_H 1 #endif -/* Borland lacks _lseeki64(), so we don't support >2GB files */ -#ifdef __BORLANDC__ -#define SIZEOF_CURL_OFF_T 4 -#else -#define SIZEOF_CURL_OFF_T 8 +/* Define if you have the header file. */ +/* #define HAVE_TERMIO_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_TERMIOS_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__) +#define HAVE_UNISTD_H 1 #endif +/* Define if you have the header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINSOCK_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINSOCK2_H 1 + +/* 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 */ -/* Define cpu-machine-OS */ -#define OS "i386-pc-win32" +/* ---------------------------------------------------------------- */ +/* FUNCTIONS */ +/* ---------------------------------------------------------------- */ -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 16 +/* Define if you have the closesocket function. */ +#define HAVE_CLOSESOCKET 1 -/* The number of bytes in a long long. */ -/* #define SIZEOF_LONG_LONG 8 */ +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 @@ -71,13 +130,13 @@ #define HAVE_GETHOSTNAME 1 /* Define if you have the getpass function. */ -/*#define HAVE_GETPASS 1*/ +/* #define HAVE_GETPASS 1 */ /* Define if you have the getservbyname function. */ #define HAVE_GETSERVBYNAME 1 /* Define if you have the gettimeofday function. */ -/* #define HAVE_GETTIMEOFDAY 1 */ +/* #define HAVE_GETTIMEOFDAY 1 */ /* Define if you have the inet_addr function. */ #define HAVE_INET_ADDR 1 @@ -85,17 +144,29 @@ /* Define if you have the inet_ntoa function. */ #define HAVE_INET_NTOA 1 +/* Define if you have the ioctlsocket function. */ +#define HAVE_IOCTLSOCKET + /* Define if you have the perror function. */ #define HAVE_PERROR 1 +/* Define if you have the RAND_screen function when using SSL */ +#define HAVE_RAND_SCREEN 1 + +/* Define if you have the `RAND_status' function when using SSL. */ +#define HAVE_RAND_STATUS 1 + /* Define if you have the select function. */ #define HAVE_SELECT 1 +/* Define if you have the setvbuf function. */ +#define HAVE_SETVBUF 1 + /* Define if you have the socket function. */ #define HAVE_SOCKET 1 /* Define if you have the strcasecmp function. */ -/*#define HAVE_STRCASECMP 1*/ +/* #define HAVE_STRCASECMP 1 */ /* Define if you have the stricmp function. */ #define HAVE_STRICMP 1 @@ -115,153 +186,107 @@ #endif /* Define if you have the tcgetattr function. */ -/*#define HAVE_TCGETATTR 1*/ +/* #define HAVE_TCGETATTR 1 */ /* Define if you have the tcsetattr function. */ -/*#define HAVE_TCSETATTR 1*/ +/* #define HAVE_TCSETATTR 1 */ /* Define if you have the uname function. */ -/*#define HAVE_UNAME 1*/ +/* #define HAVE_UNAME 1 */ -/* Define if you have utime() */ +/* Define if you have the utime function */ #ifndef __BORLANDC__ #define HAVE_UTIME 1 #endif -/* Define if you have the header file. */ -/*#define HAVE_ALLOCA_H 1*/ - -/* Define if you have the malloc.h file. */ -#define HAVE_MALLOC_H 1 - -/* Define if you have the header file. */ -/* #define HAVE_ARPA_INET_H 1 */ - -/* Define if you have the header file. */ -#define HAVE_ASSERT_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_CRYPTO_H */ - -/* Define if you have the header file. */ -/*#define HAVE_DLFCN_H 1*/ - -/* Define if you have the header file. */ -/* #undef HAVE_ERR_H */ - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_GETOPT_H */ - -/* Define if you have the header file. */ -/* #define HAVE_NETDB_H 1 */ - -/* Define if you have the header file. */ -/*#define HAVE_NETINET_IN_H 1*/ - -/* Define if you have the header file. */ -/*#define HAVE_SGTTY_H 1*/ - -/* Define if you have the header file. */ -/* #undef HAVE_SSL_H */ - -/* Define if you have the header file. */ -/*#define HAVE_SYS_PARAM_H 1*/ +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 -/* Define if you have the header file. */ -/* #define HAVE_SYS_SELECT_H 1 */ +/* ---------------------------------------------------------------- */ +/* TYPEDEF REPLACEMENTS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ -/*#define HAVE_SYS_SOCKET_H 1*/ +/* Define this if in_addr_t is not an available 'typedefed' type */ +#define in_addr_t unsigned long -/* Define if you have the header file. */ -/* #define HAVE_SYS_SOCKIO_H 1 */ +/* Define as the return type of signal handlers (int or void). */ +/* #define RETSIGTYPE void */ -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +/* Define to `unsigned' if size_t is not an available 'typedefed' type */ +/* #define size_t unsigned */ -/* Define if you have the header file */ -#ifndef __BORLANDC__ -#define HAVE_SYS_UTIME_H 1 +/* Define to 'int' if ssize_t is not an available 'typedefed' type */ +#if defined(__WATCOMC__) && (__WATCOMC__ >= 1240) +#else +#define ssize_t int #endif -/* Define if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the header file. */ -/* #define HAVE_TERMIO_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_TERMIOS_H 1 */ - -/* Name of package */ -#define PACKAGE "curl" - -/* Define if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define if you have the header file. */ -#define HAVE_TIME_H 1 - -/* Define if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have the header file. */ -#define HAVE_WINSOCK_H 1 +/* Define to 'int' if socklen_t is not an available 'typedefed' type */ +#ifndef HAVE_WS2TCPIP_H +#define socklen_t int +#endif -/* Define if you have the header file. */ -#define HAVE_WINSOCK2_H 1 +/* ---------------------------------------------------------------- */ +/* TYPE SIZES */ +/* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ -#define HAVE_WS2TCPIP_H 1 +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 16 -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* The number of bytes in a long long. */ +/* #define SIZEOF_LONG_LONG 8 */ -/* Define if you have the closesocket function. */ -#define HAVE_CLOSESOCKET 1 +/* Undef SIZEOF_CURL_OFF_T if already defined. */ +#ifdef SIZEOF_CURL_OFF_T +#undef SIZEOF_CURL_OFF_T +#endif -/* Define if you have the setvbuf function. */ -#define HAVE_SETVBUF 1 +/* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ +/* Borland lacks _lseeki64(), so we don't support >2GB files. */ +#ifdef __BORLANDC__ +#define SIZEOF_CURL_OFF_T 4 +#else +#define SIZEOF_CURL_OFF_T 8 +#endif -/* Define if you have the RAND_screen function when using SSL */ -#define HAVE_RAND_SCREEN 1 +/* ---------------------------------------------------------------- */ +/* STRUCT RELATED */ +/* ---------------------------------------------------------------- */ -/* Define if you have the `RAND_status' function. */ -#define HAVE_RAND_STATUS 1 +/* Define this if you have struct sockaddr_storage */ +#define HAVE_STRUCT_SOCKADDR_STORAGE -/* Define this to if in_addr_t is not an available typedefed type */ -#define in_addr_t unsigned long +/* ---------------------------------------------------------------- */ +/* COMPILER SPECIFIC */ +/* ---------------------------------------------------------------- */ -/* use ioctlsocket() for non-blocking sockets */ -#define HAVE_IOCTLSOCKET +/* Undef keyword 'const' if it does not work. */ +/* #undef const */ -/* Define this if you have struct sockaddr_storage */ -#define HAVE_STRUCT_SOCKADDR_STORAGE +/* ---------------------------------------------------------------- */ +/* LDAP LIBRARY FILES */ +/* ---------------------------------------------------------------- */ /* lber dynamic library file */ /* #undef DL_LBER_FILE */ -/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ -#define _CRT_SECURE_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE - /* ldap dynamic library file */ #define DL_LDAP_FILE "wldap32.dll" -/************************************************* - * This section is for compiler specific defines.* - *************************************************/ -/* Borland and MS don't have this */ -#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +/* ---------------------------------------------------------------- */ +/* ADDITIONAL DEFINITIONS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE -#else +/* Define cpu-machine-OS */ +#undef OS +#define OS "i386-pc-win32" -#endif +/* Name of package */ +#define PACKAGE "curl" -#endif + +#endif /* __LIB_CONFIG_WIN32_H */ -- cgit v1.2.1 From 0ad3e046a43bfa18f86ae9b32b7ee585d06e2b35 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 18 Dec 2005 16:50:33 +0000 Subject: Fix spacing. When defining, define to 1. --- lib/config-win32.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index f41f33f5c..92d06e23d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -19,19 +19,19 @@ #define HAVE_ASSERT_H 1 /* Define if you have the header file. */ -/* #undef HAVE_CRYPTO_H */ +/* #define HAVE_CRYPTO_H 1 */ /* Define if you have the header file. */ /* #define HAVE_DLFCN_H 1 */ /* Define if you have the header file. */ -/* #undef HAVE_ERR_H */ +/* #define HAVE_ERR_H 1 */ /* Define if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define if you have the header file. */ -/* #undef HAVE_GETOPT_H */ +/* #define HAVE_GETOPT_H 1 */ /* Define if you have the header file. */ #define HAVE_IO_H 1 @@ -43,25 +43,25 @@ /* #define HAVE_NETDB_H 1 */ /* Define if you have the header file. */ -/* #define HAVE_NETINET_IN_H 1*/ +/* #define HAVE_NETINET_IN_H 1 */ /* Define if you have the header file. */ -/* #define HAVE_SGTTY_H 1*/ +/* #define HAVE_SGTTY_H 1 */ /* Define if you have the header file. */ -/* #undef HAVE_SSL_H */ +/* #define HAVE_SSL_H 1 */ /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define if you have the header file. */ -/* #define HAVE_SYS_PARAM_H 1*/ +/* #define HAVE_SYS_PARAM_H 1 */ /* Define if you have the header file. */ /* #define HAVE_SYS_SELECT_H 1 */ /* Define if you have the header file. */ -/* #define HAVE_SYS_SOCKET_H 1*/ +/* #define HAVE_SYS_SOCKET_H 1 */ /* Define if you have the header file. */ /* #define HAVE_SYS_SOCKIO_H 1 */ @@ -121,7 +121,7 @@ #define HAVE_CLOSESOCKET 1 /* Define if you don't have vprintf but do have _doprnt. */ -/* #undef HAVE_DOPRNT */ +/* #define HAVE_DOPRNT 1 */ /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 @@ -145,7 +145,7 @@ #define HAVE_INET_NTOA 1 /* Define if you have the ioctlsocket function. */ -#define HAVE_IOCTLSOCKET +#define HAVE_IOCTLSOCKET 1 /* Define if you have the perror function. */ #define HAVE_PERROR 1 @@ -254,7 +254,7 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ -#define HAVE_STRUCT_SOCKADDR_STORAGE +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ @@ -268,7 +268,7 @@ /* ---------------------------------------------------------------- */ /* lber dynamic library file */ -/* #undef DL_LBER_FILE */ +/* #define DL_LBER_FILE */ /* ldap dynamic library file */ #define DL_LDAP_FILE "wldap32.dll" @@ -278,8 +278,8 @@ /* ---------------------------------------------------------------- */ /* Defines set for VS2005 to _not_ deprecate a few functions we use. */ -#define _CRT_SECURE_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE 1 +#define _CRT_NONSTDC_NO_DEPRECATE 1 /* Define cpu-machine-OS */ #undef OS -- cgit v1.2.1 From 7b51aafa86219025e94c9658a28f084b928f750c Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Tue, 20 Dec 2005 22:20:04 +0000 Subject: Changes for PellesC compiler under Win32. A bit limited, but we just love swedish products... --- lib/config-win32.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 92d06e23d..59dd44130 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -87,7 +87,8 @@ #define HAVE_TIME_H 1 /* Define if you have the header file. */ -#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \ + defined(__POCC__) #define HAVE_UNISTD_H 1 #endif @@ -181,7 +182,7 @@ #define HAVE_STRSTR 1 /* Define if you have the strtoll function. */ -#if defined(__MINGW32__) || defined(__WATCOMC__) +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__POCC__) #define HAVE_STRTOLL 1 #endif @@ -216,7 +217,7 @@ /* #define size_t unsigned */ /* Define to 'int' if ssize_t is not an available 'typedefed' type */ -#if defined(__WATCOMC__) && (__WATCOMC__ >= 1240) +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) #else #define ssize_t int #endif @@ -242,8 +243,8 @@ #endif /* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ -/* Borland lacks _lseeki64(), so we don't support >2GB files. */ -#ifdef __BORLANDC__ +/* Borland/PellesC lacks _lseeki64(), so we don't support >2GB files. */ +#if defined(__BORLANDC__) || defined(__POCC__) #define SIZEOF_CURL_OFF_T 4 #else #define SIZEOF_CURL_OFF_T 8 -- cgit v1.2.1 From 60b029869f3f21ba73350793f8f7355f13d538cc Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sun, 26 Feb 2006 17:08:33 +0000 Subject: Use getprotobyname() to retrieve protocol number for TCP (sorry, I don't know how to add this to the configure process). --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 59dd44130..9b3d531d7 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -136,6 +136,9 @@ /* Define if you have the getservbyname function. */ #define HAVE_GETSERVBYNAME 1 +/* Define if you have the getprotobyname function. */ +#define HAVE_GETPROTOBYNAME + /* Define if you have the gettimeofday function. */ /* #define HAVE_GETTIMEOFDAY 1 */ -- cgit v1.2.1 From 414c57d138b9fe21eeecde730d9369eaedbdbc89 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Wed, 26 Apr 2006 17:11:05 +0000 Subject: Added support for Salford-C under Win32 (scc). HAVE_MALLOC_H and HAVE_PROCESS_H added for all except scc. --- lib/config-win32.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 9b3d531d7..600d28c8b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -37,7 +37,9 @@ #define HAVE_IO_H 1 /* Define if you have the header file. */ +#ifndef __SALFORDC__ #define HAVE_MALLOC_H 1 +#endif /* Define if you have the header file. */ /* #define HAVE_NETDB_H 1 */ @@ -45,6 +47,11 @@ /* Define if you have the header file. */ /* #define HAVE_NETINET_IN_H 1 */ +/* Define if you have the header file. */ +#ifndef __SALFORDC__ +#define HAVE_PROCESS_H 1 +#endif + /* Define if you have the header file. */ /* #define HAVE_SGTTY_H 1 */ @@ -98,11 +105,13 @@ /* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 +#ifndef __SALFORDC__ /* Define if you have the header file. */ #define HAVE_WINSOCK2_H 1 /* Define if you have the header file. */ #define HAVE_WS2TCPIP_H 1 +#endif /* ---------------------------------------------------------------- */ /* OTHER HEADER INFO */ @@ -246,8 +255,10 @@ #endif /* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ -/* Borland/PellesC lacks _lseeki64(), so we don't support >2GB files. */ -#if defined(__BORLANDC__) || defined(__POCC__) +/* Borland/PellesC/SalfordC lacks _lseeki64(), so we don't support + * >2GB files. + */ +#if defined(__BORLANDC__) || defined(__POCC__) || defined(__SALFORDC__) #define SIZEOF_CURL_OFF_T 4 #else #define SIZEOF_CURL_OFF_T 8 @@ -258,7 +269,9 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ +#ifndef __SALFORDC__ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 +#endif /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ -- cgit v1.2.1 From 89f54f373979d182dfec4ddb7c9adbccbca9f2f1 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 4 Jul 2006 16:10:13 +0000 Subject: Platforms that don't have/run configure need default values in their config files for: HAVE_GETNAMEINFO, GETNAMEINFO_QUAL_ARG1, GETNAMEINFO_TYPE_ARG1, GETNAMEINFO_TYPE_ARG2, GETNAMEINFO_TYPE_ARG46, GETNAMEINFO_TYPE_ARG7 HAVE_RECV, RECV_TYPE_ARG1, RECV_TYPE_ARG2, RECV_TYPE_ARG3, RECV_TYPE_ARG4, RECV_TYPE_RETV HAVE_SEND, SEND_TYPE_ARG1, SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4, SEND_TYPE_RETV --- lib/config-win32.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 600d28c8b..c8839d8ac 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -215,6 +215,60 @@ /* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 +/* Define if you have the getnameinfo function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to the type qualifier of arg 1 for getnameinfo. */ +#define GETNAMEINFO_QUAL_ARG1 const + +/* Define to the type of arg 1 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * + +/* Define to the type of arg 2 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG2 socklen_t + +/* Define to the type of args 4 and 6 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG46 DWORD + +/* Define to the type of arg 7 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG7 int + +/* Define if you have the recv function. */ +#define HAVE_RECV 1 + +/* Define to the type of arg 1 for recv. */ +#define RECV_TYPE_ARG1 SOCKET + +/* Define to the type of arg 2 for recv. */ +#define RECV_TYPE_ARG2 char * + +/* Define to the type of arg 3 for recv. */ +#define RECV_TYPE_ARG3 int + +/* Define to the type of arg 4 for recv. */ +#define RECV_TYPE_ARG4 int + +/* Define to the function return type for recv. */ +#define RECV_TYPE_RETV int + +/* Define if you have the send function. */ +#define HAVE_SEND 1 + +/* Define to the type of arg 1 for send. */ +#define SEND_TYPE_ARG1 SOCKET + +/* Define to the type of arg 2 for send. */ +#define SEND_TYPE_ARG2 char * + +/* Define to the type of arg 3 for send. */ +#define SEND_TYPE_ARG3 int + +/* Define to the type of arg 4 for send. */ +#define SEND_TYPE_ARG4 int + +/* Define to the function return type for send. */ +#define SEND_TYPE_RETV int + /* ---------------------------------------------------------------- */ /* TYPEDEF REPLACEMENTS */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 7e43d06b602f5158b7240b03efad7f7066d0650d Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 4 Jul 2006 16:54:10 +0000 Subject: Get qualifier of arg 2 for send() apart into SEND_QUAL_ARG2. --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c8839d8ac..891183a14 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -257,6 +257,9 @@ /* Define to the type of arg 1 for send. */ #define SEND_TYPE_ARG1 SOCKET +/* Define to the type qualifier of arg 2 for send. */ +#define SEND_QUAL_ARG2 const + /* Define to the type of arg 2 for send. */ #define SEND_TYPE_ARG2 char * -- cgit v1.2.1 From fe22872d14c3b6b63ac27a9017ed9695ac3b932b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 11 Jul 2006 21:34:23 +0000 Subject: include only if HAVE_MALLOC_H and NEED_MALLOC_H are both defined. --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 891183a14..bda87752e 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -41,6 +41,11 @@ #define HAVE_MALLOC_H 1 #endif +/* Define if you need the malloc.h header file. */ +#ifndef __SALFORDC__ +#define NEED_MALLOC_H 1 +#endif + /* Define if you have the header file. */ /* #define HAVE_NETDB_H 1 */ -- cgit v1.2.1 From 13616f8f96b12bbbec1ca40ea4356560a456cc11 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 25 Jul 2006 13:49:49 +0000 Subject: Simplify check for NEED_MALLOC_H, and make more explicit that NEED_MALLOC_H shall be defined if header file must be included even when including . --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index bda87752e..33322c839 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -41,7 +41,7 @@ #define HAVE_MALLOC_H 1 #endif -/* Define if you need the malloc.h header file. */ +/* Define if you need the malloc.h header file even with stdlib.h */ #ifndef __SALFORDC__ #define NEED_MALLOC_H 1 #endif -- cgit v1.2.1 From dc3ed353132f853dc3ddee410a4f9423534a8289 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 14 Oct 2006 12:01:44 +0000 Subject: Define HAVE_STRUCT_TIMEVAL as appropriate for platforms that lack autotools support --- lib/config-win32.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/config-win32.h') 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 */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 3204494883f6097b73e086d414fda244f1a7b587 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 13 Nov 2006 17:26:43 +0000 Subject: bug #1595348 by Ron pointed out this flaw and fix --- lib/config-win32.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 871e6bef6..1090a1c25 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -290,11 +290,9 @@ /* Define as the return type of signal handlers (int or void). */ /* #define RETSIGTYPE void */ -/* Define to `unsigned' if size_t is not an available 'typedefed' type */ -/* #define size_t unsigned */ - -/* Define to 'int' if ssize_t is not an available 'typedefed' type */ #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) +#elif defined(_WIN64) +#define ssize_t __int64 #else #define ssize_t int #endif -- cgit v1.2.1 From bcd8a3b2403d6269a121c469273880021f2cfb20 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 24 Nov 2006 16:38:58 +0000 Subject: Define HAVE_SIGNAL_H, HAVE_SIG_ATOMIC_T and HAVE_SIG_ATOMIC_T_VOLATILE as appropriate for platforms that don't have autotools support --- lib/config-win32.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 1090a1c25..3fd08f5bf 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -57,6 +57,9 @@ #define HAVE_PROCESS_H 1 #endif +/* Define if you have the header file. */ +#define HAVE_SIGNAL_H 1 + /* Define if you have the header file. */ /* #define HAVE_SGTTY_H 1 */ @@ -125,6 +128,9 @@ /* OTHER HEADER INFO */ /* ---------------------------------------------------------------- */ +/* Define if sig_atomic_t is an available typedef. */ +#define HAVE_SIG_ATOMIC_T 1 + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.1 From a46f55b9de423b4084982467d6f28f69a64ab8f3 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 25 Nov 2006 01:02:52 +0000 Subject: Make sure RETSIGTYPE is properly defined --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 3fd08f5bf..443be95e6 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -294,7 +294,7 @@ #define in_addr_t unsigned long /* Define as the return type of signal handlers (int or void). */ -/* #define RETSIGTYPE void */ +#define RETSIGTYPE void #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) #elif defined(_WIN64) -- cgit v1.2.1 From 318a8258fdac1a103eec29878c91850199cfdfd0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 5 Dec 2006 15:00:14 +0000 Subject: oops, fix belonging to the previous curl_getdate() fix since it makes MSVC use gmtime_r --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 443be95e6..8efdf209b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -352,6 +352,11 @@ /* Undef keyword 'const' if it does not work. */ /* #undef const */ +#if _MSC_VER > 1310 +/* MSVC 2003 has gmtime_r */ +#define HAVE_GMTIME_R +#endif + /* ---------------------------------------------------------------- */ /* LDAP LIBRARY FILES */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From d6b06128829d41c5e346bff424e48ddce0b7e990 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 5 Dec 2006 15:24:18 +0000 Subject: better preprocessor check for recent MSVC versions --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 8efdf209b..b9703cfcf 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -352,7 +352,7 @@ /* Undef keyword 'const' if it does not work. */ /* #undef const */ -#if _MSC_VER > 1310 +#if defined(_MSC_VER) && (_MSC_VER > 1310) /* MSVC 2003 has gmtime_r */ #define HAVE_GMTIME_R #endif -- cgit v1.2.1 From e021fe94449ca01f0ccbdfa0b20ea564f7b8d5f0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 13 Feb 2007 21:21:44 +0000 Subject: - Robert A. Monat made libcurl build fine with VC2005 - it doesn't have gmtime_r() like the older VC versions. He also made use of some machine- specific defines to differentiate the "OS" define. --- lib/config-win32.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index b9703cfcf..3e1721204 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -352,8 +352,8 @@ /* Undef keyword 'const' if it does not work. */ /* #undef const */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) -/* MSVC 2003 has gmtime_r */ +#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1400) +/* MSVC 2003 has gmtime_r, MSVC 2005 doesn't */ #define HAVE_GMTIME_R #endif @@ -377,7 +377,15 @@ /* Define cpu-machine-OS */ #undef OS +#if defined(_M_IX86) /* x86 */ #define OS "i386-pc-win32" +#elif defined(_M_IA64) /* Itanium */ +#define OS "ia64-pc-win32" +#elif defined(_M_X64) /* AMD64/EM64T - Not defined until MSVC 2005 */ +#define OS "amd64-pc-win32" +#else +#define OS "unknown-pc-win32" +#endif /* Name of package */ #define PACKAGE "curl" -- cgit v1.2.1 From d86e6d3ed2cf6422cc3d85433486b97c7c9a99bb Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 15 Feb 2007 01:58:37 +0000 Subject: Do not define HAVE_GMTIME_R for native Windows builds --- lib/config-win32.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 3e1721204..41df3d9e3 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -2,7 +2,7 @@ #define __LIB_CONFIG_WIN32_H /* ================================================================ */ -/* lib/config-win32.h - Hand crafted config file for windows */ +/* lib/config-win32.h - Hand crafted config file for Windows */ /* ================================================================ */ /* ---------------------------------------------------------------- */ @@ -352,10 +352,8 @@ /* Undef keyword 'const' if it does not work. */ /* #undef const */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1400) -/* MSVC 2003 has gmtime_r, MSVC 2005 doesn't */ -#define HAVE_GMTIME_R -#endif +/* Windows should not have HAVE_GMTIME_R defined */ +/* #undef HAVE_GMTIME_R */ /* ---------------------------------------------------------------- */ /* LDAP LIBRARY FILES */ -- cgit v1.2.1 From 46a50aa001cd0bcec263f06db74433c3a2850cf8 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 17 Mar 2007 18:19:15 +0000 Subject: Remove unneeded 'HAVE_*' defines. Detect i386 OS-target (gcc). --- lib/config-win32.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 41df3d9e3..021576068 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -9,9 +9,6 @@ /* HEADER FILES */ /* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ -/* #define HAVE_ALLOCA_H 1 */ - /* Define if you have the header file. */ /* #define HAVE_ARPA_INET_H 1 */ @@ -36,11 +33,6 @@ /* Define if you have the header file. */ #define HAVE_IO_H 1 -/* Define if you have the header file. */ -#ifndef __SALFORDC__ -#define HAVE_MALLOC_H 1 -#endif - /* Define if you need the malloc.h header file even with stdlib.h */ #ifndef __SALFORDC__ #define NEED_MALLOC_H 1 @@ -218,17 +210,11 @@ /* Define if you have the tcsetattr function. */ /* #define HAVE_TCSETATTR 1 */ -/* Define if you have the uname function. */ -/* #define HAVE_UNAME 1 */ - /* Define if you have the utime function */ #ifndef __BORLANDC__ #define HAVE_UTIME 1 #endif -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 - /* Define if you have the getnameinfo function. */ #define HAVE_GETNAMEINFO 1 @@ -375,7 +361,7 @@ /* Define cpu-machine-OS */ #undef OS -#if defined(_M_IX86) /* x86 */ +#if defined(_M_IX86) || defined(__i386__) /* x86 (MSVC or gcc) */ #define OS "i386-pc-win32" #elif defined(_M_IA64) /* Itanium */ #define OS "ia64-pc-win32" -- cgit v1.2.1 From be5ade5c7a722e04554b6d9751947350538e68fe Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 9 Apr 2007 17:46:01 +0000 Subject: VC8+ (VS2005+) has C99 variadic macro support --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 021576068..7520d2973 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -341,6 +341,11 @@ /* Windows should not have HAVE_GMTIME_R defined */ /* #undef HAVE_GMTIME_R */ +/* Define if the compiler supports C99 variadic macro style. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#define HAVE_VARIADIC_MACROS_C99 1 +#endif + /* ---------------------------------------------------------------- */ /* LDAP LIBRARY FILES */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 10203cada98918bb9db42a2cb210dc63fb6c1aa3 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 7 Aug 2007 17:40:56 +0000 Subject: moved HAVE_LONGLONG from makefiles to config-win32.h. --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 7520d2973..67375e0c9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -346,6 +346,11 @@ #define HAVE_VARIADIC_MACROS_C99 1 #endif +/* Define if the compiler supports LONGLONG. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) +#define HAVE_LONGLONG 1 +#endif + /* ---------------------------------------------------------------- */ /* LDAP LIBRARY FILES */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From d5ed9f787f72c0ad5c7757bff94b6c5855ceb984 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Wed, 8 Aug 2007 16:59:43 +0000 Subject: blocked ssize_t define for MingW32. --- lib/config-win32.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 67375e0c9..5b2a4220a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -282,7 +282,8 @@ /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void -#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) || \ + defined(__MINGW32__) #elif defined(_WIN64) #define ssize_t __int64 #else -- cgit v1.2.1 From d0edb478964cb5bf7446c34d5ac1e9d34dc5ca63 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 11 Aug 2007 20:57:54 +0000 Subject: Patrick Monnerat modified the LDAP code and approach in curl. Starting now, the configure script checks for openldap and friends and we link with those libs just like we link all other third party libraries, and we no longer dlopen() those libraries. Our private header file lib/ldap.h was renamed to lib/curl_ldap.h due to this. I set a tag in CVS (curl-7_17_0-preldapfix) just before this commit, just in case. --- lib/config-win32.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5b2a4220a..91e76e974 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -18,9 +18,6 @@ /* Define if you have the header file. */ /* #define HAVE_CRYPTO_H 1 */ -/* Define if you have the header file. */ -/* #define HAVE_DLFCN_H 1 */ - /* Define if you have the header file. */ /* #define HAVE_ERR_H 1 */ @@ -353,14 +350,12 @@ #endif /* ---------------------------------------------------------------- */ -/* LDAP LIBRARY FILES */ +/* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -/* lber dynamic library file */ -/* #define DL_LBER_FILE */ - -/* ldap dynamic library file */ -#define DL_LDAP_FILE "wldap32.dll" +#define CURL_LDAP_WIN 1 +#undef CURL_LDAP_HYBRID +#undef HAVE_LDAP_URL_PARSE /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ -- cgit v1.2.1 From e347cff0e41028e5ad7023694c67b78d1273f039 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Mon, 20 Aug 2007 12:50:44 +0000 Subject: added define for ldap_ssl.h. --- lib/config-win32.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 91e76e974..6a2500c37 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,9 +353,16 @@ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -#define CURL_LDAP_WIN 1 +#ifdef CURL_HAS_NOVELL_LDAPSDK +#undef CURL_LDAP_HYBRID +#undef CURL_LDAP_WIN +#define HAVE_LDAP_SSL_H 1 +#define HAVE_LDAP_URL_PARSE 1 +#else #undef CURL_LDAP_HYBRID #undef HAVE_LDAP_URL_PARSE +#define CURL_LDAP_WIN 1 +#endif /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ -- cgit v1.2.1 From 68b215157fdf69612edebdb220b3804822277822 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Fri, 24 Aug 2007 17:08:49 +0000 Subject: added defines to build with OpenLDAP. --- lib/config-win32.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6a2500c37..91c63bf23 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,11 +353,15 @@ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -#ifdef CURL_HAS_NOVELL_LDAPSDK +#if defined(CURL_HAS_NOVELL_LDAPSDK) || defined(CURL_HAS_MOZILLA_LDAPSDK) #undef CURL_LDAP_HYBRID #undef CURL_LDAP_WIN #define HAVE_LDAP_SSL_H 1 #define HAVE_LDAP_URL_PARSE 1 +#elif defined(CURL_HAS_OPENLDAP_LDAPSDK) +#undef CURL_LDAP_HYBRID +#undef CURL_LDAP_WIN +#define HAVE_LDAP_URL_PARSE 1 #else #undef CURL_LDAP_HYBRID #undef HAVE_LDAP_URL_PARSE -- cgit v1.2.1 From 7ac7c119be7d01193e08d4bdbd93538a1b416dd3 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 18 Sep 2007 18:18:34 +0000 Subject: added a define for Win32 to detect already defined ssize_t. --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 91c63bf23..bd66b56c9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -279,6 +279,7 @@ /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void +#ifndef _SSIZE_T_DEFINED #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) || \ defined(__MINGW32__) #elif defined(_WIN64) @@ -286,6 +287,8 @@ #else #define ssize_t int #endif +#define _SSIZE_T_DEFINED +#endif /* Define to 'int' if socklen_t is not an available 'typedefed' type */ #ifndef HAVE_WS2TCPIP_H -- cgit v1.2.1 From 50b3545ada98e078b93fb2d0c8a39daa450eb9e4 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 9 Oct 2007 22:10:17 +0000 Subject: fix socklen_t for MSVC6 & 7. --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index bd66b56c9..0bc736431 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -291,7 +291,7 @@ #endif /* Define to 'int' if socklen_t is not an available 'typedefed' type */ -#ifndef HAVE_WS2TCPIP_H +#if defined(_MSC_VER) && (_MSC_VER <= 1400) #define socklen_t int #endif -- cgit v1.2.1 From 08c5e2a194876be4db31536ac0211695c12aa266 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 24 Oct 2007 14:39:07 +0000 Subject: Windows build targets have socklen_t definition in ws2tcpip.h but some versions of ws2tcpip.h do not have the definition. It seems that when the socklen_t definition is missing from ws2tcpip.h the definition for INET_ADDRSTRLEN is also missing, and that when one definition is present the other one also is available. --- lib/config-win32.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 0bc736431..6102f9386 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -290,11 +290,6 @@ #define _SSIZE_T_DEFINED #endif -/* Define to 'int' if socklen_t is not an available 'typedefed' type */ -#if defined(_MSC_VER) && (_MSC_VER <= 1400) -#define socklen_t int -#endif - /* ---------------------------------------------------------------- */ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From dee3844f130994f720588cdac9931e202d252641 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 7 Nov 2007 18:18:42 +0000 Subject: MSVC versions prior to VS2005 do not complain about portable C functions --- lib/config-win32.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6102f9386..97db859b9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -347,6 +347,12 @@ #define HAVE_LONGLONG 1 #endif +/* Define to avoid VS2005 complaining about portable C functions */ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#define _CRT_SECURE_NO_DEPRECATE 1 +#define _CRT_NONSTDC_NO_DEPRECATE 1 +#endif + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ @@ -370,10 +376,6 @@ /* ADDITIONAL DEFINITIONS */ /* ---------------------------------------------------------------- */ -/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ -#define _CRT_SECURE_NO_DEPRECATE 1 -#define _CRT_NONSTDC_NO_DEPRECATE 1 - /* Define cpu-machine-OS */ #undef OS #if defined(_M_IX86) || defined(__i386__) /* x86 (MSVC or gcc) */ -- cgit v1.2.1 From bcd7d03b3b814b0fc3e052819ed7d84946e846e5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 17 Dec 2007 21:19:42 +0000 Subject: Mateusz Loskot pointed out that VC++ 9.0 (2008) has the pollfd struct and defines in the SDK somehow differently so we have to add a define to the config-win32.h file to make select.h compile nicely. --- lib/config-win32.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 97db859b9..144ffe97f 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,6 +353,14 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* Define to make select.h work fine on VC++ 9.0 (2008) */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +/* The poll struct and associated defines are present in the Windows SDK v6.0 + that comes with this version... */ +#define HAVE_STRUCT_POLLFD 1 +#endif + + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From f4ffa85f6061c07b80911daa6dc8c51be9c7bd4c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 18 Dec 2007 10:36:32 +0000 Subject: pollfd struct and WSA_poll fixes for Windows Vista already present in CVS --- lib/config-win32.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 144ffe97f..97db859b9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,14 +353,6 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* Define to make select.h work fine on VC++ 9.0 (2008) */ -#if defined(_MSC_VER) && (_MSC_VER >= 1500) -/* The poll struct and associated defines are present in the Windows SDK v6.0 - that comes with this version... */ -#define HAVE_STRUCT_POLLFD 1 -#endif - - /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 07a1857d59e2da6d57eb622e90822ffa4835e1de Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 18 Dec 2007 18:08:19 +0000 Subject: MSVC 9.0 (VS2008) does not support Windows build targets prior to WinXP, and makes wrong asumptions of build target when it isn't specified. So, if no build target has been defined we will target WinXP when building with MSVC 9.0 (VS2008). --- lib/config-win32.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 97db859b9..8e57b1454 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,6 +353,20 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* VS2008 does not support Windows build targets prior to WinXP, */ +/* so, if no build target has been defined we will target WinXP. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +# endif +# ifndef WINVER +# define WINVER 0x0501 +# endif +# if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501) +# error VS2008 does not support Windows build targets prior to WinXP +# endif +#endif + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 8e9e33ae52b7b17d57c9fc8694e2f77fab11ae03 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 7 Mar 2008 02:49:14 +0000 Subject: VS2005 and later dafault size for time_t is 64-bit, unless _USE_32BIT_TIME_T has been defined to get a 32-bit time_t --- lib/config-win32.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 8e57b1454..031eda54a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,6 +353,16 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* VS2005 and later dafault size for time_t is 64-bit, unless */ +/* _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +# ifndef _USE_32BIT_TIME_T +# define SIZEOF_TIME_T 8 +# else +# define SIZEOF_TIME_T 4 +# endif +#endif + /* VS2008 does not support Windows build targets prior to WinXP, */ /* so, if no build target has been defined we will target WinXP. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) -- cgit v1.2.1 From f48eb36f758ca4d92bc45c0a9255d9becc3fe320 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 21 Apr 2008 19:17:42 +0000 Subject: HAVE_FFLUSH and HAVE_FSYNC symbol definitions for WIN32 systems --- lib/config-win32.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 031eda54a..73ac8a08e 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -136,6 +136,12 @@ /* Define if you don't have vprintf but do have _doprnt. */ /* #define HAVE_DOPRNT 1 */ +/* Define if you have the fflush function. */ +#define HAVE_FFLUSH 1 + +/* Define if you have the fsync function. */ +/* #define HAVE_FSYNC 1 */ + /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 -- cgit v1.2.1 From 95fd093c4a49aca1015e178a5c08ca9dd9234bef Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 22 Apr 2008 12:40:05 +0000 Subject: Remove fflush() + fsync() previously introduced accelerated writing of server input and response request files of the test harness sws server. Reintroduce, for test # 1001, the small delay. The delay is needed even with the accelerated writing of server input and response request files in test harness sws server. http://curl.haxx.se/mail/lib-2008-04/0385.html --- lib/config-win32.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 73ac8a08e..031eda54a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -136,12 +136,6 @@ /* Define if you don't have vprintf but do have _doprnt. */ /* #define HAVE_DOPRNT 1 */ -/* Define if you have the fflush function. */ -#define HAVE_FFLUSH 1 - -/* Define if you have the fsync function. */ -/* #define HAVE_FSYNC 1 */ - /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 -- cgit v1.2.1 From a9dc900515a28dcf55b2901a8609072430087693 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 16 Jul 2008 19:16:41 +0000 Subject: Configure process now checks availability of recvfrom() socket function and finds out its return type and the types of its arguments. Added definitions for non-configure systems config files, and introduced macro sreadfrom which will be used on udp sockets as a recvfrom() wrapper. --- lib/config-win32.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 031eda54a..d51047526 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -248,6 +248,30 @@ /* Define to the function return type for recv. */ #define RECV_TYPE_RETV int +/* Define if you have the recvfrom function. */ +#define HAVE_RECVFROM 1 + +/* Define to the type of arg 1 for recvfrom. */ +#define RECVFROM_TYPE_ARG1 SOCKET + +/* Define to the type of arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char * + +/* Define to the type of arg 3 for recvfrom. */ +#define RECVFROM_TYPE_ARG3 int + +/* Define to the type of arg 4 for recvfrom. */ +#define RECVFROM_TYPE_ARG4 int + +/* Define to the type of arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr * + +/* Define to the type of arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int * + +/* Define to the function return type for recvfrom. */ +#define RECVFROM_TYPE_RETV int + /* Define if you have the send function. */ #define HAVE_SEND 1 -- cgit v1.2.1 From 39f23aec6b3cd5e7e5dd9077d96f8eff37ff2b19 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 17 Jul 2008 03:07:54 +0000 Subject: RECVFROM_TYPE_ARG2, RECVFROM_TYPE_ARG5 and RECVFROM_TYPE_ARG6 are now defined to the data type pointed by its respective argument and not the pointer type. --- lib/config-win32.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index d51047526..6526f5497 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -254,8 +254,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 SOCKET -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 char * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int @@ -263,11 +263,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV int -- cgit v1.2.1 From 14240e9e109fe6af19438c6531d573f85dbb0b1e Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 7 Aug 2008 00:29:08 +0000 Subject: Initial support of curlbuild.h and curlrules.h which allows to have a curl_off_t data type no longer gated to off_t. --- lib/config-win32.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6526f5497..25484eb7a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -324,21 +324,6 @@ /* The number of bytes in a long long. */ /* #define SIZEOF_LONG_LONG 8 */ -/* Undef SIZEOF_CURL_OFF_T if already defined. */ -#ifdef SIZEOF_CURL_OFF_T -#undef SIZEOF_CURL_OFF_T -#endif - -/* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ -/* Borland/PellesC/SalfordC lacks _lseeki64(), so we don't support - * >2GB files. - */ -#if defined(__BORLANDC__) || defined(__POCC__) || defined(__SALFORDC__) -#define SIZEOF_CURL_OFF_T 4 -#else -#define SIZEOF_CURL_OFF_T 8 -#endif - /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 3743f515cfc5ed1b6c7bb301ceca5bafdbcc1360 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 20 Aug 2008 19:29:00 +0000 Subject: - Phil Pellouchoud pointed out that the windows version of libcurl had a memory leak because it never called the OpenSSL function CRYPTO_cleanup_all_ex_data() as it was supposed to. This was because of a missing define in config-win32.h! --- lib/config-win32.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 25484eb7a..7169bf2ec 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -172,6 +172,10 @@ /* Define if you have the `RAND_status' function when using SSL. */ #define HAVE_RAND_STATUS 1 +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. + This is present in OpenSSL versions after 0.9.6b */ +#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1 + /* Define if you have the select function. */ #define HAVE_SELECT 1 @@ -351,7 +355,7 @@ #define HAVE_VARIADIC_MACROS_C99 1 #endif -/* Define if the compiler supports LONGLONG. */ +/* Define if the compiler supports the 'long long' data type. */ #if defined(__MINGW32__) || defined(__WATCOMC__) #define HAVE_LONGLONG 1 #endif -- cgit v1.2.1 From 9849c6b8479f18d983eadd58d7ba6f9feaaa8f6a Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 22 Aug 2008 18:09:03 +0000 Subject: Adjustments to better select/differentiate when large/small file support is provided using WIN32 functions directly. --- lib/config-win32.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 7169bf2ec..a0c0bf5b2 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -390,6 +390,22 @@ # endif #endif +/* ---------------------------------------------------------------- */ +/* LARGE FILE SUPPORT */ +/* ---------------------------------------------------------------- */ + +#if defined(_MSC_VER) && !defined(_WIN32_WCE) +# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64) +# define USE_WIN32_LARGE_FILES +# else +# define USE_WIN32_SMALL_FILES +# endif +#endif + +#if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES) +# define USE_WIN32_SMALL_FILES +#endif + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 9c36a5fd06343b6b9cdf80db387b20271612a356 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Thu, 4 Sep 2008 22:04:53 +0000 Subject: fixed largefile feature for MingW32 non-configure builds. --- lib/config-win32.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index a0c0bf5b2..e43c88e34 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -402,6 +402,10 @@ # endif #endif +#if defined(__MINGW32__) && !defined(USE_WIN32_LARGE_FILES) +# define USE_WIN32_LARGE_FILES +#endif + #if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES) # define USE_WIN32_SMALL_FILES #endif -- cgit v1.2.1 From 842de91168f86858415069192782212526cc9ebe Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 15 Sep 2008 14:57:56 +0000 Subject: HAVE_STRNCASECMP and HAVE_STRNICMP definitions for WIN32 --- lib/config-win32.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index e43c88e34..c987f41ca 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -188,15 +188,21 @@ /* Define if you have the strcasecmp function. */ /* #define HAVE_STRCASECMP 1 */ -/* Define if you have the stricmp function. */ -#define HAVE_STRICMP 1 - /* Define if you have the strdup function. */ #define HAVE_STRDUP 1 /* Define if you have the strftime function. */ #define HAVE_STRFTIME 1 +/* Define if you have the stricmp function. */ +#define HAVE_STRICMP 1 + +/* Define if you have the strncasecmp function. */ +/* #define HAVE_STRNCASECMP 1 */ + +/* Define if you have the strnicmp function. */ +#define HAVE_STRNICMP 1 + /* Define if you have the strstr function. */ #define HAVE_STRSTR 1 -- cgit v1.2.1 From 4e909ee8b1e7e9f174af629615224180568a7e92 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 24 Sep 2008 12:22:16 +0000 Subject: ntoa() and inet_ntoa_r() no longer used --- lib/config-win32.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c987f41ca..0d10a04bb 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -157,9 +157,6 @@ /* Define if you have the inet_addr function. */ #define HAVE_INET_ADDR 1 -/* Define if you have the inet_ntoa function. */ -#define HAVE_INET_NTOA 1 - /* Define if you have the ioctlsocket function. */ #define HAVE_IOCTLSOCKET 1 -- cgit v1.2.1 From 6a8832d83b4d86da285124ac13dc4f4d277a8e95 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 1 Nov 2008 15:03:16 +0000 Subject: Added '#define HAVE_GETADDRINFO'. --- lib/config-win32.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 0d10a04bb..5ac22b9ef 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -219,6 +219,13 @@ #define HAVE_UTIME 1 #endif +/* The following 2 functions are strictly only available when + * _WIN32_WINNT is 0x0501 or larger. But we assume this value + * is defined. See below. */ + +/* Define if you have the getaddrinfo function. */ +#define HAVE_GETADDRINFO 1 + /* Define if you have the getnameinfo function. */ #define HAVE_GETNAMEINFO 1 -- cgit v1.2.1 From 050a39a7a578106989b32f80a625c46a87b52ca1 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 1 Nov 2008 16:52:57 +0000 Subject: WIN32 availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite convoluted, compiler dependant and in some cases even build target dependat. --- lib/config-win32.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5ac22b9ef..b782631de 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -219,16 +219,6 @@ #define HAVE_UTIME 1 #endif -/* The following 2 functions are strictly only available when - * _WIN32_WINNT is 0x0501 or larger. But we assume this value - * is defined. See below. */ - -/* Define if you have the getaddrinfo function. */ -#define HAVE_GETADDRINFO 1 - -/* Define if you have the getnameinfo function. */ -#define HAVE_GETNAMEINFO 1 - /* Define to the type qualifier of arg 1 for getnameinfo. */ #define GETNAMEINFO_QUAL_ARG1 const @@ -400,6 +390,20 @@ # endif #endif +/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ +/* convoluted, compiler dependant and in some cases even build target dependat. */ +#if defined(HAVE_WS2TCPIP_H) +# if defined(_MSC_VER) && (_MSC_VER >= 1200) +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETNAMEINFO 1 +# elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETNAMEINFO 1 +# endif +#endif + /* ---------------------------------------------------------------- */ /* LARGE FILE SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 128418b214dbb38ea1b8d08d6641ae9cbe43921f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 1 Nov 2008 17:13:10 +0000 Subject: Adjust WIN32 freeaddrinfo, getaddrinfo and getnameinfo availability --- lib/config-win32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index b782631de..88d011849 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -393,11 +393,11 @@ /* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ /* convoluted, compiler dependant and in some cases even build target dependat. */ #if defined(HAVE_WS2TCPIP_H) -# if defined(_MSC_VER) && (_MSC_VER >= 1200) +# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 -# elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# elif defined(_MSC_VER) && (_MSC_VER >= 1200) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 -- cgit v1.2.1 From 17d2a464ad42c47ec37870e4b01a18ef5593877f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 13 Nov 2008 18:56:55 +0000 Subject: Refactor configure script detection of functions used to set sockets into non-blocking mode, and decouple function detection from function capability. --- lib/config-win32.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 88d011849..dc359d6a3 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -157,9 +157,12 @@ /* Define if you have the inet_addr function. */ #define HAVE_INET_ADDR 1 -/* Define if you have the ioctlsocket function. */ +/* Define if you have the ioctlsocket function. */ #define HAVE_IOCTLSOCKET 1 +/* Define if you have a working ioctlsocket FIONBIO function. */ +#define HAVE_IOCTLSOCKET_FIONBIO 1 + /* Define if you have the perror function. */ #define HAVE_PERROR 1 -- cgit v1.2.1 From 418683f5377d7bcb751888345ba14a77fd68cdbd Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Tue, 16 Dec 2008 08:25:55 +0000 Subject: Added the use of Watt-32 tcp/ip stack for Win32 targets. --- lib/config-win32.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index dc359d6a3..eab2874cd 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -343,6 +343,30 @@ /* Define this if you have struct timeval */ #define HAVE_STRUCT_TIMEVAL 1 +/* ---------------------------------------------------------------- */ +/* Watt-32 tcp/ip SPECIFIC */ +/* ---------------------------------------------------------------- */ + +#ifdef USE_WATT32 + #include + #undef byte + #undef word + #undef USE_WINSOCK + #undef HAVE_WINSOCK_H + #undef HAVE_WINSOCK2_H + #undef HAVE_WS2TCPIP_H + #define HAVE_GETADDRINFO + #define HAVE_GETNAMEINFO + #define HAVE_SYS_IOCTL_H + #define HAVE_SYS_SOCKET_H + #define HAVE_NETINET_IN_H + #define HAVE_NETDB_H + #define HAVE_ARPA_INET_H + #define HAVE_FREEADDRINFO + #define SOCKET int +#endif + + /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From a776e5ad310f99ee0b4bab360816e30e1ce9d89c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 18 Feb 2009 19:31:55 +0000 Subject: spell-fixed comments and other minor non-code edits --- lib/config-win32.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index eab2874cd..c33137bfb 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -403,8 +403,8 @@ # endif #endif -/* VS2008 does not support Windows build targets prior to WinXP, */ -/* so, if no build target has been defined we will target WinXP. */ +/* VS2008 does not support Windows build targets prior to WinXP, so, if no + build target has been defined we will target WinXP. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0501 @@ -417,8 +417,9 @@ # endif #endif -/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ -/* convoluted, compiler dependant and in some cases even build target dependat. */ +/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is + quite convoluted, compiler dependant and in some cases even build target + dependant. */ #if defined(HAVE_WS2TCPIP_H) # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 -- cgit v1.2.1 From 51b46f451fd9bd01f794fa29b59baa73bc94ab49 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 20 Feb 2009 11:30:11 +0000 Subject: Do not halt compilation when using VS2008 to build a Windows 2000 target --- lib/config-win32.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c33137bfb..6e37a3c75 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -403,17 +403,33 @@ # endif #endif -/* VS2008 does not support Windows build targets prior to WinXP, so, if no - build target has been defined we will target WinXP. */ +/* Officially, Microsoft's Windows SDK versions 6.X do not support Windows + 2000 as a supported build target. VS2008 default installations provide an + embedded Windows SDK v6.0A along with the claim that Windows 2000 is a + valid build target for VS2008. Popular belief is that binaries built using + Windows SDK versions 6.X and Windows 2000 as a build target are functional */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# define VS2008_MINIMUM_TARGET 0x0500 +#endif + +/* When no build target is specified VS2008 default build target is Windows + Vista, which leaves out even Winsows XP. If no build target has been given + for VS2008 we will target the minimum Officially supported build target, + which happens to be Windows XP. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# define VS2008_DEFAULT_TARGET 0x0501 +#endif + +/* VS2008 default target settings and minimum build target check */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) # ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0501 +# define _WIN32_WINNT VS2008_DEFAULT_TARGET # endif # ifndef WINVER -# define WINVER 0x0501 +# define WINVER VS2008_DEFAULT_TARGET # endif -# if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501) -# error VS2008 does not support Windows build targets prior to WinXP +# if (_WIN32_WINNT < VS2008_MINIMUM_TARGET) || (WINVER < VS2008_MINIMUM_TARGET) +# error VS2008 does not support Windows build targets prior to Windows 2000 # endif #endif -- cgit v1.2.1 From 9cc6ab39220c60ee59eaae8b207216c0a319d384 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 14 Apr 2009 13:50:32 +0000 Subject: use HAVE_LIMITS_H symbol to protect limits.h inclusion --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6e37a3c75..1318d2978 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -30,6 +30,9 @@ /* Define if you have the header file. */ #define HAVE_IO_H 1 +/* Define if you have the header file. */ +#define HAVE_LIMITS_H 1 + /* Define if you need the malloc.h header file even with stdlib.h */ #ifndef __SALFORDC__ #define NEED_MALLOC_H 1 -- cgit v1.2.1 From e593715d721dd725f2bafbf9ef51a6a3a9f36a5b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 6 Oct 2009 14:00:03 +0000 Subject: Fix comment --- lib/config-win32.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 1318d2978..dd81ee1f7 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -313,6 +313,7 @@ /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void +/* Define ssize_t if it is not an available 'typedefed' type */ #ifndef _SSIZE_T_DEFINED #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) || \ defined(__MINGW32__) -- cgit v1.2.1 From b2f430898053258622eebee3328f03441367a32c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 27 Oct 2009 16:38:42 +0000 Subject: Fix Pelles C Win32 target compilation issues --- lib/config-win32.h | 66 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 14 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index dd81ee1f7..dbc44eec8 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -34,7 +34,7 @@ #define HAVE_LIMITS_H 1 /* Define if you need the malloc.h header file even with stdlib.h */ -#ifndef __SALFORDC__ +#if !defined(__SALFORDC__) && !defined(__POCC__) #define NEED_MALLOC_H 1 #endif @@ -82,7 +82,7 @@ /* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file */ +/* Define if you have the header file. */ #ifndef __BORLANDC__ #define HAVE_SYS_UTIME_H 1 #endif @@ -108,11 +108,13 @@ /* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 -#ifndef __SALFORDC__ /* Define if you have the header file. */ +#ifndef __SALFORDC__ #define HAVE_WINSOCK2_H 1 +#endif /* Define if you have the header file. */ +#ifndef __SALFORDC__ #define HAVE_WS2TCPIP_H 1 #endif @@ -315,14 +317,16 @@ /* Define ssize_t if it is not an available 'typedefed' type */ #ifndef _SSIZE_T_DEFINED -#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) || \ - defined(__MINGW32__) -#elif defined(_WIN64) -#define ssize_t __int64 -#else -#define ssize_t int -#endif -#define _SSIZE_T_DEFINED +# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \ + defined(__POCC__) || \ + defined(__MINGW32__) +# elif defined(_WIN64) +# define _SSIZE_T_DEFINED +# define ssize_t __int64 +# else +# define _SSIZE_T_DEFINED +# define ssize_t int +# endif #endif /* ---------------------------------------------------------------- */ @@ -437,11 +441,25 @@ # endif #endif +/* When no build target is specified Pelles C 5.00 and later default build + target is Windows Vista. We override default target to be Windows 2000. */ +#if defined(__POCC__) && (__POCC__ >= 500) +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0500 +# endif +# ifndef WINVER +# define WINVER 0x0500 +# endif +#endif + /* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is - quite convoluted, compiler dependant and in some cases even build target - dependant. */ + quite convoluted, compiler dependent and even build target dependent. */ #if defined(HAVE_WS2TCPIP_H) -# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# if defined(__POCC__) +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETNAMEINFO 1 +# elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 @@ -452,6 +470,15 @@ # endif #endif +#if defined(__POCC__) +# ifndef _MSC_VER +# error Microsoft extensions /Ze compiler option is required +# endif +# ifndef __POCC__OLDNAMES +# error Compatibility names /Go compiler option is required +# endif +#endif + /* ---------------------------------------------------------------- */ /* LARGE FILE SUPPORT */ /* ---------------------------------------------------------------- */ @@ -468,6 +495,10 @@ # define USE_WIN32_LARGE_FILES #endif +#if defined(__POCC__) +# undef USE_WIN32_LARGE_FILES +#endif + #if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES) # define USE_WIN32_SMALL_FILES #endif @@ -491,6 +522,10 @@ #define CURL_LDAP_WIN 1 #endif +#if defined(__POCC__) && defined(CURL_LDAP_WIN) +# define CURL_DISABLE_LDAP 1 +#endif + /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ /* ---------------------------------------------------------------- */ @@ -510,5 +545,8 @@ /* Name of package */ #define PACKAGE "curl" +#if defined(__POCC__) +# define ENABLE_IPV6 1 +#endif #endif /* __LIB_CONFIG_WIN32_H */ -- cgit v1.2.1 From c656098ee064934d315686d95074c12db7c37af5 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 24 Jan 2010 01:13:47 +0000 Subject: HAVE_GETADDRINFO_THREADSAFE definition for non-configure win32 builds --- lib/config-win32.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index dbc44eec8..f1276d3d1 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -456,17 +456,20 @@ quite convoluted, compiler dependent and even build target dependent. */ #if defined(HAVE_WS2TCPIP_H) # if defined(__POCC__) -# define HAVE_FREEADDRINFO 1 -# define HAVE_GETADDRINFO 1 -# define HAVE_GETNAMEINFO 1 +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETADDRINFO_THREADSAFE 1 +# define HAVE_GETNAMEINFO 1 # elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) -# define HAVE_FREEADDRINFO 1 -# define HAVE_GETADDRINFO 1 -# define HAVE_GETNAMEINFO 1 +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETADDRINFO_THREADSAFE 1 +# define HAVE_GETNAMEINFO 1 # elif defined(_MSC_VER) && (_MSC_VER >= 1200) -# define HAVE_FREEADDRINFO 1 -# define HAVE_GETADDRINFO 1 -# define HAVE_GETNAMEINFO 1 +# define HAVE_FREEADDRINFO 1 +# define HAVE_GETADDRINFO 1 +# define HAVE_GETADDRINFO_THREADSAFE 1 +# define HAVE_GETNAMEINFO 1 # endif #endif -- cgit v1.2.1 From 9b0e57b0f79c4e267c9953e5fba69c3ecf8a5951 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 26 Jan 2010 12:13:39 +0000 Subject: resolver selection for non-configure Windows builds, default is threaded DNS --- lib/config-win32.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index f1276d3d1..bc2dedf54 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -506,6 +506,24 @@ # define USE_WIN32_SMALL_FILES #endif +/* ---------------------------------------------------------------- */ +/* DNS RESOLVER SPECIALTY */ +/* ---------------------------------------------------------------- */ + +/* + * Undefine both USE_ARES and USE_THREADS_WIN32 for synchronous DNS + */ + +/* Define USE_ARES to enable c-ares asynchronous DNS lookups */ +/* #define USE_ARES 1 */ + +/* Define USE_THREADS_WIN32 to enable threaded asynchronous DNS lookups */ +#define USE_THREADS_WIN32 1 + +#if defined(USE_ARES) && defined(USE_THREADS_WIN32) +# error "Only one DNS lookup specialty may be defined at most" +#endif + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From cef95aadebf0be4be6b4ed82e07f38cc83faf546 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 26 Feb 2010 18:32:46 +0000 Subject: Added SIZEOF_INT and SIZEOF_SHORT definitions for non-configure systems --- lib/config-win32.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index bc2dedf54..43997faf1 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -333,12 +333,18 @@ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -/* The number of bytes in a long double. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ #define SIZEOF_LONG_DOUBLE 16 -/* The number of bytes in a long long. */ +/* The size of `long long', as computed by sizeof. */ /* #define SIZEOF_LONG_LONG 8 */ +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 43d20d81a55a0e30becea04b7e607775093ce6eb Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 4 Jun 2010 15:14:31 +0200 Subject: Enable OpenLDAP support for cygwin builds. Enable OpenLDAP support for cygwin builds. This support was disabled back in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers. cygwin's OpenSSL 0.9.8l and OpenLDAP 2.3.43 versions on cygwin 1.5.25 allow building an OpenLDAP enabled libcurl supporting back to Windows 95. Remove non-functional CURL_LDAP_HYBRID code and references. --- lib/config-win32.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 43997faf1..0c254707a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -535,16 +535,13 @@ /* ---------------------------------------------------------------- */ #if defined(CURL_HAS_NOVELL_LDAPSDK) || defined(CURL_HAS_MOZILLA_LDAPSDK) -#undef CURL_LDAP_HYBRID #undef CURL_LDAP_WIN #define HAVE_LDAP_SSL_H 1 #define HAVE_LDAP_URL_PARSE 1 #elif defined(CURL_HAS_OPENLDAP_LDAPSDK) -#undef CURL_LDAP_HYBRID #undef CURL_LDAP_WIN #define HAVE_LDAP_URL_PARSE 1 #else -#undef CURL_LDAP_HYBRID #undef HAVE_LDAP_URL_PARSE #define CURL_LDAP_WIN 1 #endif -- cgit v1.2.1 From 7239538d9acf5b6743181514814dc750b73096a8 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Wed, 30 Jun 2010 19:40:40 +0200 Subject: build: add enable IPV6 option for the VC makefiles --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 0c254707a..8c6f91a9f 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -569,7 +569,7 @@ /* Name of package */ #define PACKAGE "curl" -#if defined(__POCC__) +#if defined(__POCC__) || (USE_IPV6) # define ENABLE_IPV6 1 #endif -- cgit v1.2.1 From cfbb351e22a9f3d3a99317895975d368a1eedf31 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 29 Jul 2010 03:18:40 +0200 Subject: Watcom makefiles overhaul. - make both libcurl and curl makefiles use register calling convention (previously libcurl had stack calling convention). - added include paths to the Watcom headers so its no longer required to set the environment vars for this. - added -wcd=201 to supress compiler warning about unreachable code. - use macros for all tools, and removed dependency on GNU tools like rm. - make ipv6 and debug builds controlable via env vars and so make them optional instead of default. - commented WINLDAPAPI and WINBERAPI since they broke with OW 1.8, and it seems they're not needed (anymore?). - added rule for hugehelp.c.cvs so that it will be created when not already exist - this is required for building from a release tarball since there we have no hugehelp.c.cvs, thus compilation broke. - removed C_ARG creation from lib/Makefile.Watcom and use CFLAGS directly as done too in src/Makefile.Watcom - this has the benefit that we will see all active cflags and defines during compile. - added LINK-ARG to src/Makefile.Watcom in order to better control linker input. - a couple of other minor makefile tweaks here and there ... - added largefile support for Watcom builds to config-win32.h. Not yet tested if it really works, but should since Win32 supports it. - added loaddll stuff to speed up builds if supported. --- lib/config-win32.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 8c6f91a9f..7d0f8c60b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -504,6 +504,10 @@ # define USE_WIN32_LARGE_FILES #endif +#if defined(__WATCOMC__) && !defined(USE_WIN32_LARGE_FILES) +# define USE_WIN32_LARGE_FILES +#endif + #if defined(__POCC__) # undef USE_WIN32_LARGE_FILES #endif -- cgit v1.2.1 From b01fb30f9cf9f456be59381adbbac24fb98c30d0 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Mon, 2 Aug 2010 01:24:04 +0200 Subject: Moved the LDAP API defines from Makefile.Watcom to config-win32.h. These defines are only needed for older Watcom versions (< 1280). --- lib/config-win32.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 7d0f8c60b..5ee76065d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -550,6 +550,13 @@ #define CURL_LDAP_WIN 1 #endif +#if defined(__WATCOMC__) && defined(CURL_LDAP_WIN) +#if __WATCOMC__ < 1280 +#define WINBERAPI __declspec(cdecl) +#define WINLDAPAPI __declspec(cdecl) +#endif +#endif + #if defined(__POCC__) && defined(CURL_LDAP_WIN) # define CURL_DISABLE_LDAP 1 #endif -- cgit v1.2.1 From 3238ef5b69bf49455e0f6ff5ad35b6d0a30e9c58 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 2 Sep 2010 00:07:05 +0200 Subject: Added S_ISREG define for Win32. --- lib/config-win32.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5ee76065d..24cb6e0dd 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -391,6 +391,11 @@ /* Windows should not have HAVE_GMTIME_R defined */ /* #undef HAVE_GMTIME_R */ +/* Define S_ISREG if not defined by system headers */ +#ifndef S_ISREG +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + /* Define if the compiler supports C99 variadic macro style. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define HAVE_VARIADIC_MACROS_C99 1 -- cgit v1.2.1 From a00297158e881447deed870e4a8b9989893f15b2 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 2 Sep 2010 04:37:13 +0200 Subject: Moved S_ISREG define to setup as suggested by Dan. --- lib/config-win32.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 24cb6e0dd..5ee76065d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -391,11 +391,6 @@ /* Windows should not have HAVE_GMTIME_R defined */ /* #undef HAVE_GMTIME_R */ -/* Define S_ISREG if not defined by system headers */ -#ifndef S_ISREG -#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#endif - /* Define if the compiler supports C99 variadic macro style. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define HAVE_VARIADIC_MACROS_C99 1 -- cgit v1.2.1 From 99a07a1fdf2a4e0ee37e8c324fcb6d52222ebaff Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 2 Dec 2010 21:41:23 +0100 Subject: build: provide SIZEOF_SIZE_T definition for non-configure builds --- lib/config-win32.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 5ee76065d..67bfec3c0 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -345,6 +345,13 @@ /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 +/* The size of `size_t', as computed by sizeof. */ +#if defined(_WIN64) +# define SIZEOF_SIZE_T 8 +#else +# define SIZEOF_SIZE_T 4 +#endif + /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From 03ea06b8e3654c0e81f6304e62c16797910bb9e8 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Tue, 11 Jan 2011 17:40:13 +0100 Subject: Borland C++ doesnt have struct sockaddr_storage. --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 67bfec3c0..109784f3a 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -357,7 +357,7 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ -#ifndef __SALFORDC__ +#if !(defined(__SALFORDC__) || defined(__BORLANDC__)) #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #endif -- cgit v1.2.1 From 42f5e8a0f1729b17547acfc6625e58e583811e8d Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 12 Jan 2011 02:35:14 +0100 Subject: build: use external preprocessor cpp32 when building with Borland C --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 109784f3a..c6fb7ae93 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -357,7 +357,7 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ -#if !(defined(__SALFORDC__) || defined(__BORLANDC__)) +#if !defined(__SALFORDC__) && !defined(__BORLANDC__) #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #endif -- cgit v1.2.1 From 1aeb635cdd296c16acb375a4a83a78f13166ccab Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 10 Mar 2011 11:48:02 +0100 Subject: sources: update source headers All C and H files now (should) feature the proper project curl source code header, which includes basic info, a copyright statement and some basic disclaimers. --- lib/config-win32.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c6fb7ae93..6768dda3c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -1,5 +1,26 @@ #ifndef __LIB_CONFIG_WIN32_H #define __LIB_CONFIG_WIN32_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ /* ================================================================ */ /* lib/config-win32.h - Hand crafted config file for Windows */ -- cgit v1.2.1 From ef2176109fca302ed89193716b62c3a7113552a3 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 24 Jul 2011 04:39:43 +0200 Subject: errno.h inclusion conditionally done in setup_once.h --- lib/config-win32.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 6768dda3c..c4fe1b391 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -39,6 +39,9 @@ /* Define if you have the header file. */ /* #define HAVE_CRYPTO_H 1 */ +/* Define if you have the header file. */ +#define HAVE_ERRNO_H 1 + /* Define if you have the header file. */ /* #define HAVE_ERR_H 1 */ -- cgit v1.2.1 From a6ed2b8426675115d6d29bfec4d8597cf715b33c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 4 Aug 2011 21:27:29 +0200 Subject: BSD-style lwIP TCP/IP stack support: Allow compilation of libcurl and curl using BSD-style lwIP on Win32. In order to compile libcurl and curl with this support it is necessary to edit files lib/config-win32.h and src/config-win32.h and uncomment a line to make definition of preprocessor symbol USE_LWIPSOCK visible. Afterwards you can compile as usual. In order to use compiled library with BSD-style lwIP TCP/IP stack in your program it is mandatory that you include lwIP header file before including or Compilation has been verified with lwIP 1.4.0 and contrib-1.4.0 from: http://download.savannah.gnu.org/releases/lwip/lwip-1.4.0.zip http://download.savannah.gnu.org/releases/lwip/contrib-1.4.0.zip Have fun! --- lib/config-win32.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index c4fe1b391..e9219de19 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -388,6 +388,31 @@ /* Define this if you have struct timeval */ #define HAVE_STRUCT_TIMEVAL 1 +/* ---------------------------------------------------------------- */ +/* BSD-style lwIP TCP/IP stack SPECIFIC */ +/* ---------------------------------------------------------------- */ + +/* Define this to use BSD-style lwIP TCP/IP stack */ +/* #define USE_LWIPSOCK 1 */ + +#ifdef USE_LWIPSOCK +# undef USE_WINSOCK +# undef HAVE_WINSOCK_H +# undef HAVE_WINSOCK2_H +# undef HAVE_WS2TCPIP_H +# undef HAVE_ERRNO_H +# undef HAVE_GETHOSTNAME +# undef HAVE_GETNAMEINFO +# undef LWIP_POSIX_SOCKETS_IO_NAMES +# define HAVE_FREEADDRINFO +# define HAVE_GETADDRINFO +# define HAVE_GETHOSTBYNAME +# define HAVE_GETHOSTBYNAME_R +# define HAVE_GETHOSTBYNAME_R_6 +# define LWIP_POSIX_SOCKETS_IO_NAMES 0 +# define SOCKET int +#endif + /* ---------------------------------------------------------------- */ /* Watt-32 tcp/ip SPECIFIC */ /* ---------------------------------------------------------------- */ -- cgit v1.2.1 From f0fae85acd4fcd6696dd0e18c2ea344044562840 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 5 Aug 2011 13:20:22 +0200 Subject: keep a single copy of config-win32.h in version control repository. maketgz and buildconf.bat updated to reflect this. --- lib/config-win32.h | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index e9219de19..8c4719745 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -1,5 +1,5 @@ -#ifndef __LIB_CONFIG_WIN32_H -#define __LIB_CONFIG_WIN32_H +#ifndef HEADER_CURL_CONFIG_WIN32_H +#define HEADER_CURL_CONFIG_WIN32_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -23,7 +23,7 @@ ***************************************************************************/ /* ================================================================ */ -/* lib/config-win32.h - Hand crafted config file for Windows */ +/* Hand crafted config file for Windows */ /* ================================================================ */ /* ---------------------------------------------------------------- */ @@ -57,6 +57,9 @@ /* Define if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define if you need the malloc.h header file even with stdlib.h */ #if !defined(__SALFORDC__) && !defined(__POCC__) #define NEED_MALLOC_H 1 @@ -165,6 +168,9 @@ /* Define if you don't have vprintf but do have _doprnt. */ /* #define HAVE_DOPRNT 1 */ +/* Define if you have the ftruncate function. */ +#define HAVE_FTRUNCATE 1 + /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 @@ -208,6 +214,12 @@ /* Define if you have the select function. */ #define HAVE_SELECT 1 +/* Define if you have the setlocale function. */ +#define HAVE_SETLOCALE 1 + +/* Define if you have the setmode function. */ +#define HAVE_SETMODE 1 + /* Define if you have the setvbuf function. */ #define HAVE_SETVBUF 1 @@ -388,6 +400,9 @@ /* Define this if you have struct timeval */ #define HAVE_STRUCT_TIMEVAL 1 +/* Define this if struct sockaddr_in6 has the sin6_scope_id member */ +#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 + /* ---------------------------------------------------------------- */ /* BSD-style lwIP TCP/IP stack SPECIFIC */ /* ---------------------------------------------------------------- */ @@ -404,13 +419,20 @@ # undef HAVE_GETHOSTNAME # undef HAVE_GETNAMEINFO # undef LWIP_POSIX_SOCKETS_IO_NAMES +# undef RECV_TYPE_ARG1 +# undef RECV_TYPE_ARG3 +# undef SEND_TYPE_ARG1 +# undef SEND_TYPE_ARG3 # define HAVE_FREEADDRINFO # define HAVE_GETADDRINFO # define HAVE_GETHOSTBYNAME # define HAVE_GETHOSTBYNAME_R # define HAVE_GETHOSTBYNAME_R_6 # define LWIP_POSIX_SOCKETS_IO_NAMES 0 -# define SOCKET int +# define RECV_TYPE_ARG1 int +# define RECV_TYPE_ARG3 size_t +# define SEND_TYPE_ARG1 int +# define SEND_TYPE_ARG3 size_t #endif /* ---------------------------------------------------------------- */ @@ -477,7 +499,7 @@ 2000 as a supported build target. VS2008 default installations provide an embedded Windows SDK v6.0A along with the claim that Windows 2000 is a valid build target for VS2008. Popular belief is that binaries built using - Windows SDK versions 6.X and Windows 2000 as a build target are functional */ + Windows SDK versions 6.X and build targetting Windows 2000 are functional */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) # define VS2008_MINIMUM_TARGET 0x0500 #endif @@ -498,7 +520,8 @@ # ifndef WINVER # define WINVER VS2008_DEFAULT_TARGET # endif -# if (_WIN32_WINNT < VS2008_MINIMUM_TARGET) || (WINVER < VS2008_MINIMUM_TARGET) +# if (WINVER < VS2008_MINIMUM_TARGET) || \ +# (_WIN32_WINNT < VS2008_MINIMUM_TARGET) # error VS2008 does not support Windows build targets prior to Windows 2000 # endif #endif @@ -636,8 +659,11 @@ /* Name of package */ #define PACKAGE "curl" +/* If you want to build curl with the built-in manual */ +#define USE_MANUAL 1 + #if defined(__POCC__) || (USE_IPV6) # define ENABLE_IPV6 1 #endif -#endif /* __LIB_CONFIG_WIN32_H */ +#endif /* HEADER_CURL_CONFIG_WIN32_H */ -- cgit v1.2.1 From f6272dd9b8ae8d188068aeb0df2af496a964e407 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 5 Aug 2011 15:42:05 +0200 Subject: BSD-style lwIP TCP/IP stack support - followup --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 8c4719745..1179b1588 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -407,7 +407,7 @@ /* BSD-style lwIP TCP/IP stack SPECIFIC */ /* ---------------------------------------------------------------- */ -/* Define this to use BSD-style lwIP TCP/IP stack */ +/* Define this to use BSD-style lwIP TCP/IP stack */ /* #define USE_LWIPSOCK 1 */ #ifdef USE_LWIPSOCK -- cgit v1.2.1 From 91ad42412f97d51cc5ff54bc89d9ea6dbe391b33 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 6 Aug 2011 19:18:43 +0200 Subject: config-win32.h: comments adjustments --- lib/config-win32.h | 189 +++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 92 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index 1179b1588..e498192f8 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -30,48 +30,50 @@ /* HEADER FILES */ /* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_ARPA_INET_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_ASSERT_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_CRYPTO_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_ERRNO_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_ERR_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define if you have the header file. */ -/* #define HAVE_GETOPT_H 1 */ +/* Define if you have the header file. */ +#if defined(__MINGW32__) || defined(__POCC__) +#define HAVE_GETOPT_H 1 +#endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_IO_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_LIMITS_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_LOCALE_H 1 -/* Define if you need the malloc.h header file even with stdlib.h */ +/* Define if you need header even with header file. */ #if !defined(__SALFORDC__) && !defined(__POCC__) #define NEED_MALLOC_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_NETDB_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_NETINET_IN_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #ifndef __SALFORDC__ #define HAVE_PROCESS_H 1 #endif @@ -79,68 +81,68 @@ /* Define if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SGTTY_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SSL_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_PARAM_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SELECT_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SOCKET_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SOCKIO_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file */ +/* Define if you have the header file. */ /* #define HAVE_SYS_TIME_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #ifndef __BORLANDC__ #define HAVE_SYS_UTIME_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_TERMIO_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_TERMIOS_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_TIME_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \ defined(__POCC__) #define HAVE_UNISTD_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_WINDOWS_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_WINSOCK_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #ifndef __SALFORDC__ #define HAVE_WINSOCK2_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ #ifndef __SALFORDC__ #define HAVE_WS2TCPIP_H 1 #endif @@ -152,44 +154,44 @@ /* Define if sig_atomic_t is an available typedef. */ #define HAVE_SIG_ATOMIC_T 1 -/* Define if you have the ANSI C header files. */ +/* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define if you can safely include both and . */ +/* Define if you can safely include both and . */ /* #define TIME_WITH_SYS_TIME 1 */ /* ---------------------------------------------------------------- */ /* FUNCTIONS */ /* ---------------------------------------------------------------- */ -/* Define if you have the closesocket function. */ +/* Define if you have the closesocket function. */ #define HAVE_CLOSESOCKET 1 -/* Define if you don't have vprintf but do have _doprnt. */ +/* Define if you don't have vprintf but do have _doprnt. */ /* #define HAVE_DOPRNT 1 */ -/* Define if you have the ftruncate function. */ +/* Define if you have the ftruncate function. */ #define HAVE_FTRUNCATE 1 -/* Define if you have the gethostbyaddr function. */ +/* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 -/* Define if you have the gethostname function. */ +/* Define if you have the gethostname function. */ #define HAVE_GETHOSTNAME 1 -/* Define if you have the getpass function. */ +/* Define if you have the getpass function. */ /* #define HAVE_GETPASS 1 */ -/* Define if you have the getservbyname function. */ +/* Define if you have the getservbyname function. */ #define HAVE_GETSERVBYNAME 1 -/* Define if you have the getprotobyname function. */ +/* Define if you have the getprotobyname function. */ #define HAVE_GETPROTOBYNAME -/* Define if you have the gettimeofday function. */ +/* Define if you have the gettimeofday function. */ /* #define HAVE_GETTIMEOFDAY 1 */ -/* Define if you have the inet_addr function. */ +/* Define if you have the inet_addr function. */ #define HAVE_INET_ADDR 1 /* Define if you have the ioctlsocket function. */ @@ -198,41 +200,41 @@ /* Define if you have a working ioctlsocket FIONBIO function. */ #define HAVE_IOCTLSOCKET_FIONBIO 1 -/* Define if you have the perror function. */ +/* Define if you have the perror function. */ #define HAVE_PERROR 1 -/* Define if you have the RAND_screen function when using SSL */ +/* Define if you have the RAND_screen function when using SSL. */ #define HAVE_RAND_SCREEN 1 /* Define if you have the `RAND_status' function when using SSL. */ #define HAVE_RAND_STATUS 1 -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. +/* Define if you have the `CRYPTO_cleanup_all_ex_data' function. This is present in OpenSSL versions after 0.9.6b */ #define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1 -/* Define if you have the select function. */ +/* Define if you have the select function. */ #define HAVE_SELECT 1 -/* Define if you have the setlocale function. */ +/* Define if you have the setlocale function. */ #define HAVE_SETLOCALE 1 /* Define if you have the setmode function. */ #define HAVE_SETMODE 1 -/* Define if you have the setvbuf function. */ +/* Define if you have the setvbuf function. */ #define HAVE_SETVBUF 1 -/* Define if you have the socket function. */ +/* Define if you have the socket function. */ #define HAVE_SOCKET 1 -/* Define if you have the strcasecmp function. */ +/* Define if you have the strcasecmp function. */ /* #define HAVE_STRCASECMP 1 */ -/* Define if you have the strdup function. */ +/* Define if you have the strdup function. */ #define HAVE_STRDUP 1 -/* Define if you have the strftime function. */ +/* Define if you have the strftime function. */ #define HAVE_STRFTIME 1 /* Define if you have the stricmp function. */ @@ -244,21 +246,21 @@ /* Define if you have the strnicmp function. */ #define HAVE_STRNICMP 1 -/* Define if you have the strstr function. */ +/* Define if you have the strstr function. */ #define HAVE_STRSTR 1 -/* Define if you have the strtoll function. */ +/* Define if you have the strtoll function. */ #if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__POCC__) #define HAVE_STRTOLL 1 #endif -/* Define if you have the tcgetattr function. */ +/* Define if you have the tcgetattr function. */ /* #define HAVE_TCGETATTR 1 */ -/* Define if you have the tcsetattr function. */ +/* Define if you have the tcsetattr function. */ /* #define HAVE_TCSETATTR 1 */ -/* Define if you have the utime function */ +/* Define if you have the utime function. */ #ifndef __BORLANDC__ #define HAVE_UTIME 1 #endif @@ -345,13 +347,13 @@ /* TYPEDEF REPLACEMENTS */ /* ---------------------------------------------------------------- */ -/* Define this if in_addr_t is not an available 'typedefed' type */ +/* Define if in_addr_t is not an available 'typedefed' type. */ #define in_addr_t unsigned long -/* Define as the return type of signal handlers (int or void). */ +/* Define to the return type of signal handlers (int or void). */ #define RETSIGTYPE void -/* Define ssize_t if it is not an available 'typedefed' type */ +/* Define if ssize_t is not an available 'typedefed' type. */ #ifndef _SSIZE_T_DEFINED # if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \ defined(__POCC__) || \ @@ -369,19 +371,19 @@ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -/* The size of `int', as computed by sizeof. */ +/* Define to the size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of `long double', as computed by sizeof. */ +/* Define to the size of `long double', as computed by sizeof. */ #define SIZEOF_LONG_DOUBLE 16 -/* The size of `long long', as computed by sizeof. */ +/* Define to the size of `long long', as computed by sizeof. */ /* #define SIZEOF_LONG_LONG 8 */ -/* The size of `short', as computed by sizeof. */ +/* Define to the size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -/* The size of `size_t', as computed by sizeof. */ +/* Define to the size of `size_t', as computed by sizeof. */ #if defined(_WIN64) # define SIZEOF_SIZE_T 8 #else @@ -392,22 +394,22 @@ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ -/* Define this if you have struct sockaddr_storage */ +/* Define if you have struct sockaddr_storage. */ #if !defined(__SALFORDC__) && !defined(__BORLANDC__) #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #endif -/* Define this if you have struct timeval */ +/* Define if you have struct timeval. */ #define HAVE_STRUCT_TIMEVAL 1 -/* Define this if struct sockaddr_in6 has the sin6_scope_id member */ +/* Define if struct sockaddr_in6 has the sin6_scope_id member. */ #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 /* ---------------------------------------------------------------- */ /* BSD-style lwIP TCP/IP stack SPECIFIC */ /* ---------------------------------------------------------------- */ -/* Define this to use BSD-style lwIP TCP/IP stack */ +/* Define to use BSD-style lwIP TCP/IP stack. */ /* #define USE_LWIPSOCK 1 */ #ifdef USE_LWIPSOCK @@ -463,8 +465,11 @@ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ -/* Undef keyword 'const' if it does not work. */ -/* #undef const */ +/* Define to nothing if compiler does not support 'const' qualifier. */ +/* #define const */ + +/* Define to nothing if compiler does not support 'volatile' qualifier. */ +/* #define volatile */ /* Windows should not have HAVE_GMTIME_R defined */ /* #undef HAVE_GMTIME_R */ @@ -479,14 +484,14 @@ #define HAVE_LONGLONG 1 #endif -/* Define to avoid VS2005 complaining about portable C functions */ +/* Define to avoid VS2005 complaining about portable C functions. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* VS2005 and later dafault size for time_t is 64-bit, unless */ -/* _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ +/* VS2005 and later dafault size for time_t is 64-bit, unless + _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) # ifndef _USE_32BIT_TIME_T # define SIZEOF_TIME_T 8 @@ -496,12 +501,13 @@ #endif /* Officially, Microsoft's Windows SDK versions 6.X do not support Windows - 2000 as a supported build target. VS2008 default installations provide an - embedded Windows SDK v6.0A along with the claim that Windows 2000 is a - valid build target for VS2008. Popular belief is that binaries built using - Windows SDK versions 6.X and build targetting Windows 2000 are functional */ + 2000 as a supported build target. VS2008 default installations provide + an embedded Windows SDK v6.0A along with the claim that Windows 2000 is + a valid build target for VS2008. Popular belief is that binaries built + with VS2008 using Windows SDK versions 6.X and Windows 2000 as a build + target are functional. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) -# define VS2008_MINIMUM_TARGET 0x0500 +# define VS2008_MIN_TARGET 0x0500 #endif /* When no build target is specified VS2008 default build target is Windows @@ -509,19 +515,18 @@ for VS2008 we will target the minimum Officially supported build target, which happens to be Windows XP. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) -# define VS2008_DEFAULT_TARGET 0x0501 +# define VS2008_DEF_TARGET 0x0501 #endif -/* VS2008 default target settings and minimum build target check */ +/* VS2008 default target settings and minimum build target check. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) # ifndef _WIN32_WINNT -# define _WIN32_WINNT VS2008_DEFAULT_TARGET +# define _WIN32_WINNT VS2008_DEF_TARGET # endif # ifndef WINVER -# define WINVER VS2008_DEFAULT_TARGET +# define WINVER VS2008_DEF_TARGET # endif -# if (WINVER < VS2008_MINIMUM_TARGET) || \ -# (_WIN32_WINNT < VS2008_MINIMUM_TARGET) +# if (_WIN32_WINNT < VS2008_MIN_TARGET) || (WINVER < VS2008_MIN_TARGET) # error VS2008 does not support Windows build targets prior to Windows 2000 # endif #endif @@ -600,13 +605,13 @@ /* ---------------------------------------------------------------- */ /* - * Undefine both USE_ARES and USE_THREADS_WIN32 for synchronous DNS + * Undefine both USE_ARES and USE_THREADS_WIN32 for synchronous DNS. */ -/* Define USE_ARES to enable c-ares asynchronous DNS lookups */ +/* Define to enable c-ares asynchronous DNS lookups. */ /* #define USE_ARES 1 */ -/* Define USE_THREADS_WIN32 to enable threaded asynchronous DNS lookups */ +/* Define to enable threaded asynchronous DNS lookups. */ #define USE_THREADS_WIN32 1 #if defined(USE_ARES) && defined(USE_THREADS_WIN32) -- cgit v1.2.1 From dee7a08f647b350c80627f27faa9b0216098cdc6 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Tue, 20 Sep 2011 12:32:04 +0200 Subject: Changed Windows 64bit OS define to x86_64. Also added check for __x86_64__ define since MinGW64 seems to define the _M_X64 macro through a header not available for config-win32.h. --- lib/config-win32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/config-win32.h') diff --git a/lib/config-win32.h b/lib/config-win32.h index e498192f8..cfbca9ca3 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -653,10 +653,10 @@ #undef OS #if defined(_M_IX86) || defined(__i386__) /* x86 (MSVC or gcc) */ #define OS "i386-pc-win32" +#elif defined(_M_X64) || defined(__x86_64__) /* x86_64 (MSVC >=2005 or gcc) */ +#define OS "x86_64-pc-win32" #elif defined(_M_IA64) /* Itanium */ #define OS "ia64-pc-win32" -#elif defined(_M_X64) /* AMD64/EM64T - Not defined until MSVC 2005 */ -#define OS "amd64-pc-win32" #else #define OS "unknown-pc-win32" #endif -- cgit v1.2.1