From 0ad3e046a43bfa18f86ae9b32b7ee585d06e2b35 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 18 Dec 2005 16:50:33 +0000 Subject: [PATCH] Fix spacing. When defining, define to 1. --- ares/config-win32.h | 73 ++++++++++++++++++++++++++++++++++++-------- lib/config-win32.h | 28 ++++++++--------- lib/config-win32ce.h | 38 +++++++++++------------ src/config-win32.h | 4 +-- 4 files changed, 95 insertions(+), 48 deletions(-) diff --git a/ares/config-win32.h b/ares/config-win32.h index cbf4d5dd1..3ce3caa42 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -16,24 +16,71 @@ * without express or implied warranty. */ -#define HAVE_WINDOWS_H -#define HAVE_WINSOCK2_H -#define HAVE_WS2TCPIP_H +/* ================================================================ */ +/* ares/config-win32.h - Hand crafted config file for windows */ +/* ================================================================ */ +/* ---------------------------------------------------------------- */ +/* HEADER FILES */ +/* ---------------------------------------------------------------- */ + +/* Define if you have the header file. */ #if defined(__MINGW32__) -#define HAVE_GETOPT_H +#define HAVE_GETOPT_H 1 #endif -#if defined(__MINGW32__) || defined(__WATCOMC__) -#define HAVE_UNISTD_H +/* Define if you have the header file. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) +#define HAVE_UNISTD_H 1 #endif -#define HAVE_AF_INET6 -#define HAVE_PF_INET6 -#define HAVE_IOCTLSOCKET -#define HAVE_STRUCT_IN6_ADDR -#define HAVE_STRUCT_SOCKADDR_IN6 -#define HAVE_STRUCT_ADDRINFO -#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID +/* 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 + +/* ---------------------------------------------------------------- */ +/* FUNCTIONS */ +/* ---------------------------------------------------------------- */ + +/* Define if you have the ioctlsocket function. */ +#define HAVE_IOCTLSOCKET 1 + +/* ---------------------------------------------------------------- */ +/* STRUCT RELATED */ +/* ---------------------------------------------------------------- */ + +/* Define this if you have struct addrinfo */ +#define HAVE_STRUCT_ADDRINFO 1 + +/* Define this if you have struct sockaddr_storage */ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* ---------------------------------------------------------------- */ +/* IPV6 COMPATIBILITY */ +/* ---------------------------------------------------------------- */ + +/* Define this if you have address family AF_INET6 */ +#define HAVE_AF_INET6 1 + +/* Define this if you have protocol family PF_INET6 */ +#define HAVE_PF_INET6 1 + +/* Define this if you have struct in6_addr */ +#define HAVE_STRUCT_IN6_ADDR 1 + +/* Define this if you have struct sockaddr_in6 */ +#define HAVE_STRUCT_SOCKADDR_IN6 1 + +/* Define this if you have sockaddr_in6 with scopeid */ +#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 + #endif /* __ARES_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 diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index e25bb733d..2b1436613 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.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 */ @@ -119,7 +119,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 @@ -143,7 +143,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 @@ -179,7 +179,7 @@ #define HAVE_STRSTR 1 /* Define if you have the strtoll function. */ -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__WATCOMC__) #define HAVE_STRTOLL 1 #endif @@ -242,7 +242,7 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ -/* #define HAVE_STRUCT_SOCKADDR_STORAGE */ +/* #define HAVE_STRUCT_SOCKADDR_STORAGE 1 */ /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ @@ -256,7 +256,7 @@ /* ---------------------------------------------------------------- */ /* lber dynamic library file */ -/* #undef DL_LBER_FILE */ +/* #define DL_LBER_FILE */ /* ldap dynamic library file */ /* #define DL_LDAP_FILE "wldap32.dll" */ @@ -266,8 +266,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 @@ -280,10 +280,10 @@ /* WinCE */ /* ---------------------------------------------------------------- */ -#define CURL_DISABLE_FILE -#define CURL_DISABLE_TELNET -#define CURL_DISABLE_LDAP -#define WITHOUT_MM_LIB +#define CURL_DISABLE_FILE 1 +#define CURL_DISABLE_TELNET 1 +#define CURL_DISABLE_LDAP 1 +#define WITHOUT_MM_LIB 1 #ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN diff --git a/src/config-win32.h b/src/config-win32.h index 278af4818..ab60a2e1e 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -69,8 +69,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 */ #ifndef OS