moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

'Fix' windows builds

Browse Source
This commit is contained in:
Yang Tse 2005-12-16 20:55:07 +00:00
parent d6ffb4c177
commit e105d5c28f
7 changed files with 106 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ares/config-win32.h
View File

@ -16,6 +16,10 @@
#ifndef __CONFIG_WIN32_H
#define __CONFIG_WIN32_H
#define HAVE_WINDOWS_H
#define HAVE_WINSOCK2_H
#define HAVE_WS2TCPIP_H
#if defined(__MINGW32__)
#define HAVE_GETOPT_H
#endif

30
ares/setup.h
View File

@ -22,6 +22,34 @@
#include "config-win32.h"
#endif
/*
* Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h,
* winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
* to any other further and independant block.
*/
#ifdef WIN32
# 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
# endif
#endif
/* simple work-around for now, for systems without configure support */
#ifndef __DJGPP__
#define ssize_t int
@ -44,8 +72,6 @@
/* now typedef our socket type */
#if defined(WIN32) && !defined(WATT32)
#include <winsock2.h>
#include <ws2tcpip.h>
typedef SOCKET ares_socket_t;
#define ARES_SOCKET_BAD INVALID_SOCKET
#else

3
lib/config-win32.h
View File

@ -205,6 +205,9 @@
/* 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

3
lib/config-win32ce.h
View File

@ -194,6 +194,9 @@
/* 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

42
lib/setup.h
View File

@ -64,6 +64,34 @@
#include "amigaos.h"
#endif
/*
* Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h,
* winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
* to any other further and independant block.
*/
#ifdef WIN32
# 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
# endif
#endif
#ifndef TRUE
#define TRUE 1
#endif
@ -161,20 +189,6 @@ typedef unsigned char bool;
#ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN /* Prevent including <winsock*.h> in <windows.h> */
#endif /* WIN32_LEAN_AND_MEAN */
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h> /* required by telnet.c */
#endif
#if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
#include <ws2tcpip.h>
#endif
#endif
#if !defined(__GNUC__) || defined(__MINGW32__)
#define sclose(x) closesocket(x)

12
src/config-win32.h
View File

@ -23,6 +23,18 @@
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_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 utime() */
#if !defined(__BORLANDC__)
#define HAVE_UTIME 1

28
src/setup.h
View File

@ -60,6 +60,34 @@
#include "../lib/setup.h"
#endif
/*
* Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h,
* winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
* to any other further and independant block.
*/
#ifdef WIN32
# 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
# endif
#endif
#include <stdio.h>
#ifdef __TANDEM