diff options
| -rw-r--r-- | ares/config-win32.h | 8 | ||||
| -rw-r--r-- | lib/config-win32.h | 343 | ||||
| -rw-r--r-- | lib/config-win32ce.h | 348 | ||||
| -rw-r--r-- | src/config-win32.h | 85 |
4 files changed, 439 insertions, 345 deletions
diff --git a/ares/config-win32.h b/ares/config-win32.h index 4847507f5..cbf4d5dd1 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -1,3 +1,6 @@ +#ifndef __ARES_CONFIG_WIN32_H +#define __ARES_CONFIG_WIN32_H + /* $Id$ */ /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al @@ -13,9 +16,6 @@ * without express or implied warranty. */ -#ifndef __CONFIG_WIN32_H -#define __CONFIG_WIN32_H - #define HAVE_WINDOWS_H #define HAVE_WINSOCK2_H #define HAVE_WS2TCPIP_H @@ -36,4 +36,4 @@ #define HAVE_STRUCT_ADDRINFO #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID -#endif /* __CONFIG_WIN32_H */ +#endif /* __ARES_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 <alloca.h> 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 <arpa/inet.h> header file. */ +/* #define HAVE_ARPA_INET_H 1 */ -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 +/* Define if you have the <assert.h> 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 <crypto.h> header file. */ +/* #undef HAVE_CRYPTO_H */ -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -/* #undef size_t */ +/* Define if you have the <dlfcn.h> 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 <err.h> 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 <fcntl.h> 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 <getopt.h> header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define if you have the <io.h> header file. */ +#define HAVE_IO_H 1 + +/* Define if you have the <malloc.h> header file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the <netdb.h> header file. */ +/* #define HAVE_NETDB_H 1 */ + +/* Define if you have the <netinet/in.h> header file. */ +/* #define HAVE_NETINET_IN_H 1*/ + +/* Define if you have the <sgtty.h> header file. */ +/* #define HAVE_SGTTY_H 1*/ + +/* Define if you have the <ssl.h> header file. */ +/* #undef HAVE_SSL_H */ + +/* Define if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the <sys/param.h> header file. */ +/* #define HAVE_SYS_PARAM_H 1*/ + +/* Define if you have the <sys/select.h> header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define if you have the <sys/socket.h> header file. */ +/* #define HAVE_SYS_SOCKET_H 1*/ + +/* Define if you have the <sys/sockio.h> header file. */ +/* #define HAVE_SYS_SOCKIO_H 1 */ + +/* Define if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the <sys/utime.h> 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 <termio.h> header file. */ +/* #define HAVE_TERMIO_H 1 */ + +/* Define if you have the <termios.h> header file. */ +/* #define HAVE_TERMIOS_H 1 */ + +/* Define if you have the <time.h> header file. */ +#define HAVE_TIME_H 1 + +/* Define if you have the <unistd.h> header file. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +#define HAVE_UNISTD_H 1 #endif +/* Define if you have the <windows.h> header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the <winsock.h> header file. */ +#define HAVE_WINSOCK_H 1 + +/* Define if you have the <winsock2.h> header file. */ +#define HAVE_WINSOCK2_H 1 + +/* Define if you have the <ws2tcpip.h> 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 <sys/time.h> and <time.h>. */ /* #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 <alloca.h> 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 <arpa/inet.h> header file. */ -/* #define HAVE_ARPA_INET_H 1 */ - -/* Define if you have the <assert.h> header file. */ -#define HAVE_ASSERT_H 1 - -/* Define if you have the <crypto.h> header file. */ -/* #undef HAVE_CRYPTO_H */ - -/* Define if you have the <dlfcn.h> header file. */ -/*#define HAVE_DLFCN_H 1*/ - -/* Define if you have the <err.h> header file. */ -/* #undef HAVE_ERR_H */ - -/* Define if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the <getopt.h> header file. */ -/* #undef HAVE_GETOPT_H */ - -/* Define if you have the <netdb.h> header file. */ -/* #define HAVE_NETDB_H 1 */ - -/* Define if you have the <netinet/in.h> header file. */ -/*#define HAVE_NETINET_IN_H 1*/ - -/* Define if you have the <sgtty.h> header file. */ -/*#define HAVE_SGTTY_H 1*/ - -/* Define if you have the <ssl.h> header file. */ -/* #undef HAVE_SSL_H */ - -/* Define if you have the <sys/param.h> header file. */ -/*#define HAVE_SYS_PARAM_H 1*/ +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 -/* Define if you have the <sys/select.h> header file. */ -/* #define HAVE_SYS_SELECT_H 1 */ +/* ---------------------------------------------------------------- */ +/* TYPEDEF REPLACEMENTS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <sys/socket.h> 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 <sys/sockio.h> 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 <sys/stat.h> 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 <sys/utime.h> 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 <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the <termio.h> header file. */ -/* #define HAVE_TERMIO_H 1 */ - -/* Define if you have the <termios.h> header file. */ -/* #define HAVE_TERMIOS_H 1 */ - -/* Name of package */ -#define PACKAGE "curl" - -/* Define if you have the <io.h> header file. */ -#define HAVE_IO_H 1 - -/* Define if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* Define if you have the <windows.h> header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have the <winsock.h> 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 <winsock2.h> header file. */ -#define HAVE_WINSOCK2_H 1 +/* ---------------------------------------------------------------- */ +/* TYPE SIZES */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <ws2tcpip.h> 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 <stdlib.h> 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 <unistd.h> 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 */ diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index ffc89d0b2..e25bb733d 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -1,46 +1,109 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +#ifndef __LIB_CONFIG_WIN32CE_H +#define __LIB_CONFIG_WIN32CE_H -#ifndef __CONFIG_WIN32CE_H -#define __CONFIG_WIN32CE_H +/* ================================================================ */ +/* lib/config-win32ce.h - Hand crafted config file for windows ce */ +/* ================================================================ */ -/* 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 <alloca.h> 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 <arpa/inet.h> header file. */ +/* #define HAVE_ARPA_INET_H 1 */ -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 +/* Define if you have the <assert.h> 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 <crypto.h> header file. */ +/* #undef HAVE_CRYPTO_H */ -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -/* #undef size_t */ +/* Define if you have the <dlfcn.h> header file. */ +/* #define HAVE_DLFCN_H 1 */ -/* Define this to 'int' if ssize_t is not an available typedefed type */ -#define ssize_t int +/* Define if you have the <err.h> 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 <fcntl.h> 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 <getopt.h> header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define if you have the <io.h> header file. */ +#define HAVE_IO_H 1 + +/* Define if you have the <malloc.h> header file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the <netdb.h> header file. */ +/* #define HAVE_NETDB_H 1 */ + +/* Define if you have the <netinet/in.h> header file. */ +/* #define HAVE_NETINET_IN_H 1*/ + +/* Define if you have the <sgtty.h> header file. */ +/* #define HAVE_SGTTY_H 1*/ + +/* Define if you have the <ssl.h> header file. */ +/* #undef HAVE_SSL_H */ + +/* Define if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the <sys/param.h> header file. */ +/* #define HAVE_SYS_PARAM_H 1*/ + +/* Define if you have the <sys/select.h> header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define if you have the <sys/socket.h> header file. */ +/* #define HAVE_SYS_SOCKET_H 1*/ + +/* Define if you have the <sys/sockio.h> header file. */ +/* #define HAVE_SYS_SOCKIO_H 1 */ + +/* Define if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the <sys/types.h> header file. */ +/* #define HAVE_SYS_TYPES_H 1 */ + +/* Define if you have the <sys/utime.h> header file */ +#define HAVE_SYS_UTIME_H 1 + +/* Define if you have the <termio.h> header file. */ +/* #define HAVE_TERMIO_H 1 */ + +/* Define if you have the <termios.h> header file. */ +/* #define HAVE_TERMIOS_H 1 */ + +/* Define if you have the <time.h> header file. */ +#define HAVE_TIME_H 1 + +/* Define if you have the <unistd.h> header file. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +#define HAVE_UNISTD_H 1 #endif -/* Borland lacks _lseeki64(), so we don't support >2GB files */ -#define SIZEOF_CURL_OFF_T 4 +/* Define if you have the <windows.h> header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the <winsock.h> header file. */ +#define HAVE_WINSOCK_H 1 + +/* Define if you have the <winsock2.h> header file. */ +/* #define HAVE_WINSOCK2_H 1 */ + +/* Define if you have the <ws2tcpip.h> header file. */ +/* #define HAVE_WS2TCPIP_H 1 */ + +/* ---------------------------------------------------------------- */ +/* OTHER HEADER INFO */ +/* ---------------------------------------------------------------- */ /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -48,14 +111,15 @@ /* Define if you can safely include both <sys/time.h> and <time.h>. */ /* #define TIME_WITH_SYS_TIME 1 */ -/* Define cpu-machine-OS */ -#define OS "i386-pc-win32ce" +/* ---------------------------------------------------------------- */ +/* 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 @@ -64,7 +128,7 @@ #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 @@ -78,178 +142,166 @@ /* 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 +/* #define HAVE_STRICMP 1 */ /* Define if you have the strdup function. */ -//#define HAVE_STRDUP 1 +/* #define HAVE_STRDUP 1 */ /* Define if you have the strftime function. */ -//#define HAVE_STRFTIME 1 +/* #define HAVE_STRFTIME 1 */ /* Define if you have the strstr function. */ #define HAVE_STRSTR 1 /* Define if you have the strtoll function. */ -#ifdef __MINGW32__ +#ifdef __MINGW32__ #define HAVE_STRTOLL 1 #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 */ #define HAVE_UTIME 1 -/* Define if you have the <alloca.h> header file. */ -/*#define HAVE_ALLOCA_H 1*/ +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 -/* Define if you have the malloc.h file. */ -#define HAVE_MALLOC_H 1 +/* ---------------------------------------------------------------- */ +/* TYPEDEF REPLACEMENTS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <arpa/inet.h> header file. */ -/* #define HAVE_ARPA_INET_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 <assert.h> 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 <crypto.h> header file. */ -/* #undef HAVE_CRYPTO_H */ +/* Define to `unsigned' if size_t is not an available 'typedefed' type */ +/* #define size_t unsigned */ -/* Define if you have the <dlfcn.h> header file. */ -/*#define HAVE_DLFCN_H 1*/ +/* Define to 'int' if ssize_t is not an available 'typedefed' type */ +#define ssize_t int -/* Define if you have the <err.h> header file. */ -/* #undef HAVE_ERR_H */ +/* 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 <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 +/* ---------------------------------------------------------------- */ +/* TYPE SIZES */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <getopt.h> header file. */ -/* #undef HAVE_GETOPT_H */ +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 16 -/* Define if you have the <netdb.h> header file. */ -/* #define HAVE_NETDB_H 1 */ +/* The number of bytes in a long long. */ +/* #define SIZEOF_LONG_LONG 8 */ -/* Define if you have the <netinet/in.h> header file. */ -/*#define HAVE_NETINET_IN_H 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 <sgtty.h> header file. */ -/*#define HAVE_SGTTY_H 1*/ +/* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ +#define SIZEOF_CURL_OFF_T 4 -/* Define if you have the <ssl.h> header file. */ -/* #undef HAVE_SSL_H */ +/* ---------------------------------------------------------------- */ +/* STRUCT RELATED */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <sys/param.h> header file. */ -/*#define HAVE_SYS_PARAM_H 1*/ +/* Define this if you have struct sockaddr_storage */ +/* #define HAVE_STRUCT_SOCKADDR_STORAGE */ -/* Define if you have the <sys/select.h> header file. */ -/* #define HAVE_SYS_SELECT_H 1 */ +/* ---------------------------------------------------------------- */ +/* COMPILER SPECIFIC */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <sys/socket.h> header file. */ -/*#define HAVE_SYS_SOCKET_H 1*/ +/* Undef keyword 'const' if it does not work. */ +/* #undef const */ -/* Define if you have the <sys/sockio.h> header file. */ -/* #define HAVE_SYS_SOCKIO_H 1 */ +/* ---------------------------------------------------------------- */ +/* LDAP LIBRARY FILES */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 +/* lber dynamic library file */ +/* #undef DL_LBER_FILE */ -/* Define if you have the <sys/utime.h> header file */ -#define HAVE_SYS_UTIME_H 1 +/* ldap dynamic library file */ +/* #define DL_LDAP_FILE "wldap32.dll" */ -/* Define if you have the <sys/types.h> header file. */ -//#define HAVE_SYS_TYPES_H 1 +/* ---------------------------------------------------------------- */ +/* ADDITIONAL DEFINITIONS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <termio.h> header file. */ -/* #define HAVE_TERMIO_H 1 */ +/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE -/* Define if you have the <termios.h> header file. */ -/* #define HAVE_TERMIOS_H 1 */ +/* Define cpu-machine-OS */ +#undef OS +#define OS "i386-pc-win32ce" /* Name of package */ #define PACKAGE "curl" -/* Define if you have the <io.h> header file. */ -#define HAVE_IO_H 1 - -/* Define if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* Define if you have the <windows.h> header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have the <winsock.h> header file. */ -#define HAVE_WINSOCK_H 1 - -/* Define if you have the <winsock2.h> header file. */ -//#define HAVE_WINSOCK2_H 1 - -/* Define if you have the <ws2tcpip.h> header file. */ -//#define HAVE_WS2TCPIP_H 1 - -/* Define if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_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 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 - -/* use ioctlsocket() for non-blocking sockets */ -#define HAVE_IOCTLSOCKET - -/************************************************* - * This section is for compiler specific defines.* - *************************************************/ -/* Borland and MS don't have this */ -#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) - -/* Define if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -#else - -#endif - -/* WinCE */ +/* ---------------------------------------------------------------- */ +/* WinCE */ +/* ---------------------------------------------------------------- */ #define CURL_DISABLE_FILE - #define CURL_DISABLE_TELNET #define CURL_DISABLE_LDAP #define WITHOUT_MM_LIB -#include <winsock.h> -#include <process.h> +#ifdef HAVE_WINDOWS_H +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include <windows.h> +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# ifdef HAVE_WS2TCPIP_H +# include <ws2tcpip.h> +# endif +# else +# ifdef HAVE_WINSOCK_H +# include <winsock.h> +# endif +# endif +# include <process.h> +#endif #define ENOSPC 1 #define ENOMEM 2 @@ -257,4 +309,4 @@ extern int stat(const char *path,struct stat *buffer ); -#endif +#endif /* __LIB_CONFIG_WIN32CE_H */ diff --git a/src/config-win32.h b/src/config-win32.h index 307627f27..278af4818 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -1,27 +1,35 @@ -/* src/config-win32.h. manually created to look like a config.h. */ -/* Define if you have the stricmp function. */ -#define HAVE_STRICMP 1 +#ifndef __SRC_CONFIG_WIN32_H +#define __SRC_CONFIG_WIN32_H -/* Define to 1 if you want the built-in manual */ -#define USE_MANUAL 1 +/* ================================================================ */ +/* src/config-win32.h - Hand crafted config file for windows */ +/* ================================================================ */ -/* Define cpu-machine-OS */ -#define OS "i386-pc-win32" +/* ---------------------------------------------------------------- */ +/* HEADER FILES */ +/* ---------------------------------------------------------------- */ + +/* Define if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 /* Define if you have the <io.h> header file. */ #define HAVE_IO_H 1 -/* Define if you have the <limits.h> header file */ +/* Define if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 -/* Define if you have the ftruncate function. */ -#define HAVE_FTRUNCATE 1 +/* Define if you have the <locale.h> header file. */ +#define HAVE_LOCALE_H 1 -/* Define if you have the strdup function. */ -#define HAVE_STRDUP 1 +/* Define if you have the <sys/utime.h> header file. */ +#ifndef __BORLANDC__ +#define HAVE_SYS_UTIME_H 1 +#endif -/* Define if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 +/* Define if you have the <unistd.h> header file. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +#define HAVE_UNISTD_H 1 +#endif /* Define if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1 @@ -35,33 +43,42 @@ /* Define if you have the <ws2tcpip.h> header file. */ #define HAVE_WS2TCPIP_H 1 -/* Define if you have utime() */ -#if !defined(__BORLANDC__) -#define HAVE_UTIME 1 - -/* Define if you have the <sys/utime.h> header file */ -#define HAVE_SYS_UTIME_H 1 -#endif +/* ---------------------------------------------------------------- */ +/* FUNCTIONS */ +/* ---------------------------------------------------------------- */ -/* Define if you have the <locale.h> header file */ -#define HAVE_LOCALE_H 1 +/* Define if you have the ftruncate function. */ +#define HAVE_FTRUNCATE 1 -/* Define if you have the setlocale() function. */ +/* Define if you have the setlocale function. */ #define HAVE_SETLOCALE 1 -/* Defines set for VS2005 to _not_ decprecate a few functions we use. */ +/* Define if you have the strdup function. */ +#define HAVE_STRDUP 1 + +/* Define if you have the stricmp function. */ +#define HAVE_STRICMP 1 + +/* Define if you have the utime function */ +#ifndef __BORLANDC__ +#define HAVE_UTIME 1 +#endif + +/* ---------------------------------------------------------------- */ +/* ADDITIONAL DEFINITIONS */ +/* ---------------------------------------------------------------- */ + +/* Defines set for VS2005 to _not_ deprecate a few functions we use. */ #define _CRT_SECURE_NO_DEPRECATE #define _CRT_NONSTDC_NO_DEPRECATE -/************************************************* - * This section is for compiler specific defines.* - *************************************************/ -/* Borland and MS don't have this */ -#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +/* Define cpu-machine-OS */ +#ifndef OS +#define OS "i386-pc-win32" +#endif -/* Define if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 +/* Define to 1 if you want the built-in manual */ +#define USE_MANUAL 1 -#else -#endif +#endif /* __SRC_CONFIG_WIN32_H */ |