moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Windows related cleanup

This commit is contained in:
Yang Tse 2005-12-17 20:37:53 +00:00
parent 939d368d5f
commit bc8590aa12
3 changed files with 114 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
ares/setup.h
View File

@ -1,5 +1,5 @@
#ifndef ARES_SETUP_H #ifndef __ARES_SETUP_H
#define ARES_SETUP_H #define __ARES_SETUP_H
/* Copyright (C) 2004 - 2005 by Daniel Stenberg et al /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
* *
@ -14,6 +14,21 @@
* without express or implied warranty. * without express or implied warranty.
*/ */
#if !defined(WIN32) && defined(__WIN32__)
/* Borland fix */
#define WIN32
#endif
#if !defined(WIN32) && defined(_WIN32)
/* VS2005 on x64 fix */
#define WIN32
#endif
/*
* Include configuration script results or hand-crafted
* configuration file for platforms which lack config tool.
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#else #else
@ -22,6 +37,7 @@
#include "config-win32.h" #include "config-win32.h"
#endif #endif
#endif /* HAVE_CONFIG_H */
/* /*
* Include header files for windows builds before redefining anything. * Include header files for windows builds before redefining anything.
@ -30,38 +46,46 @@
* to any other further and independant block. * to any other further and independant block.
*/ */
#ifdef WIN32 #ifdef HAVE_WINDOWS_H
# ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN
# ifndef WIN32_LEAN_AND_MEAN # define 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 # endif
# include <windows.h> # else
# ifdef HAVE_WINSOCK2_H # ifdef HAVE_WINSOCK_H
# include <winsock2.h> # include <winsock.h>
# ifdef HAVE_WS2TCPIP_H
# include <ws2tcpip.h>
# endif
# else
# ifdef HAVE_WINSOCK_H
# include <winsock.h>
# endif
# endif # endif
# endif # endif
#endif #endif
/+
* Work-arounds for systems without configure support
*/
/* simple work-around for now, for systems without configure support */ #ifndef HAVE_CONFIG_H
#ifndef __DJGPP__
#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240))
#else
#define ssize_t int #define ssize_t int
#endif #endif
#ifndef _MSC_VER
#ifndef HAVE_WS2TCPIP_H
#define socklen_t int #define socklen_t int
#endif #endif
#endif /* HAVE_CONFIG_H */
/* Recent autoconf versions define these symbols in config.h. We don't want #endif /* HAVE_CONFIG_H */
them (since they collide with the libcurl ones when we build
--enable-debug) so we undef them again here. */ /*
* Recent autoconf versions define these symbols in config.h. We don't
* want them (since they collide with the libcurl ones when we build
* --enable-debug) so we undef them again here.
*/
#undef PACKAGE_STRING #undef PACKAGE_STRING
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
@ -70,7 +94,10 @@
#undef VERSION #undef VERSION
#undef PACKAGE #undef PACKAGE
/* now typedef our socket type */ /*
* Typedef our socket type
*/
#if defined(WIN32) && !defined(WATT32) #if defined(WIN32) && !defined(WATT32)
typedef SOCKET ares_socket_t; typedef SOCKET ares_socket_t;
#define ARES_SOCKET_BAD INVALID_SOCKET #define ARES_SOCKET_BAD INVALID_SOCKET
@ -79,8 +106,10 @@ typedef int ares_socket_t;
#define ARES_SOCKET_BAD -1 #define ARES_SOCKET_BAD -1
#endif #endif
/* Assume a few thing unless they're set by configure /*
* Assume a few thing unless they're set by configure
*/ */
#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) #if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
#define HAVE_SYS_TIME_H #define HAVE_SYS_TIME_H
#endif #endif
@ -115,4 +144,4 @@ int ares_strcasecmp(const char *s1, const char *s2);
#endif #endif
#endif #endif
#endif /* ARES_SETUP_H */ #endif /* __ARES_SETUP_H */

55
lib/setup.h
View File

@ -34,36 +34,41 @@
#endif /* HTTP_ONLY */ #endif /* HTTP_ONLY */
#if !defined(WIN32) && defined(__WIN32__) #if !defined(WIN32) && defined(__WIN32__)
/* This should be a good Borland fix. */ /* Borland fix */
#define WIN32
#endif
#if !defined(WIN32) && defined(_WIN32)
/* This works for VS2005 on x64 */
#define WIN32 #define WIN32
#endif #endif
#if !defined(WIN32) && defined(_WIN32)
/* VS2005 on x64 fix */
#define WIN32
#endif
/*
* Include configuration script results or hand-crafted
* configuration file for platforms which lack config tool.
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" /* the configure script results */ #include "config.h"
#else #else
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include "config-win32ce.h" #include "config-win32ce.h"
#else #else
#ifdef WIN32 #ifdef WIN32
/* hand-modified win32 config.h! */
#include "config-win32.h" #include "config-win32.h"
#endif /* WIN32 */ #endif
#endif /* WIN32_WCE */ #endif
#endif /* HAVE_CONFIG_H */
#ifdef macintosh #ifdef macintosh
/* hand-modified MacOS config.h! */
#include "config-mac.h" #include "config-mac.h"
#endif #endif
#ifdef AMIGA #ifdef AMIGA
/* hand-modified AmigaOS config.h! */
#include "amigaos.h" #include "amigaos.h"
#endif #endif
#endif /* HAVE_CONFIG_H */
/* /*
* Include header files for windows builds before redefining anything. * Include header files for windows builds before redefining anything.
@ -72,21 +77,19 @@
* to any other further and independant block. * to any other further and independant block.
*/ */
#ifdef WIN32 #ifdef HAVE_WINDOWS_H
# ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN
# ifndef WIN32_LEAN_AND_MEAN # define 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 # endif
# include <windows.h> # else
# ifdef HAVE_WINSOCK2_H # ifdef HAVE_WINSOCK_H
# include <winsock2.h> # include <winsock.h>
# ifdef HAVE_WS2TCPIP_H
# include <ws2tcpip.h>
# endif
# else
# ifdef HAVE_WINSOCK_H
# include <winsock.h>
# endif
# endif # endif
# endif # endif
#endif #endif

55
src/setup.h
View File

@ -1,5 +1,5 @@
#ifndef __CLIENT_SETUP_H #ifndef __SRC_CURL_SETUP_H
#define __CLIENT_SETUP_H #define __SRC_CURL_SETUP_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -29,29 +29,38 @@
/* Borland fix */ /* Borland fix */
#define WIN32 #define WIN32
#endif #endif
#if !defined(WIN32) && defined(_WIN32) #if !defined(WIN32) && defined(_WIN32)
/* This works for VS2005 on x64 */ /* VS2005 on x64 fix */
#define WIN32 #define WIN32
#endif #endif
/*
* Include configuration script results or hand-crafted
* configuration file for platforms which lack config tool.
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" /* the configure script results */ #include "config.h"
#else #else
#ifdef WIN32 #ifdef WIN32
/* include the hand-modified win32 adjusted config.h! */
#include "config-win32.h" #include "config-win32.h"
#endif #endif
#ifdef macintosh #ifdef macintosh
/* this is not the same as Mac OS X */
#include "config-mac.h" #include "config-mac.h"
#endif #endif
#ifdef __riscos__ #ifdef __riscos__
#include "config-riscos.h" #include "config-riscos.h"
#endif #endif
#ifdef __amigaos__ #ifdef __amigaos__
#include "config-amigaos.h" #include "config-amigaos.h"
#endif #endif
#endif
#endif /* HAVE_CONFIG_H */
#if defined(CURLDEBUG) && defined(CURLTOOLDEBUG) #if defined(CURLDEBUG) && defined(CURLTOOLDEBUG)
/* This is an ugly hack for CURLDEBUG conditions only. We need to include /* This is an ugly hack for CURLDEBUG conditions only. We need to include
@ -60,7 +69,6 @@
#include "../lib/setup.h" #include "../lib/setup.h"
#endif #endif
/* /*
* Include header files for windows builds before redefining anything. * Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h, * Use this preproessor block only to include or exclude windows.h,
@ -68,26 +76,23 @@
* to any other further and independant block. * to any other further and independant block.
*/ */
#ifdef WIN32 #ifdef HAVE_WINDOWS_H
# ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN
# ifndef WIN32_LEAN_AND_MEAN # define 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 # endif
# include <windows.h> # else
# ifdef HAVE_WINSOCK2_H # ifdef HAVE_WINSOCK_H
# include <winsock2.h> # include <winsock.h>
# ifdef HAVE_WS2TCPIP_H
# include <ws2tcpip.h>
# endif
# else
# ifdef HAVE_WINSOCK_H
# include <winsock.h>
# endif
# endif # endif
# endif # endif
#endif #endif
#include <stdio.h> #include <stdio.h>
#ifdef __TANDEM #ifdef __TANDEM
@ -102,7 +107,7 @@
#endif #endif
#if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool) #if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool)
typedef char bool; typedef unsigned char bool;
#define typedef_bool #define typedef_bool
#endif #endif
@ -157,4 +162,4 @@ int fileno( FILE *stream);
#define SIZEOF_CURL_OFF_T sizeof(curl_off_t) #define SIZEOF_CURL_OFF_T sizeof(curl_off_t)
#endif #endif
#endif /* __SETUP_H */ #endif /* __SRC_CURL_SETUP_H */