Commit 749f5387 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Gisle Vanem's IPv6-on-Windows patch applied!

parent 7553341b
Loading
Loading
Loading
Loading
+20 −6
Original line number Diff line number Diff line
@@ -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 <alloca.h> header file.  */
/*#define HAVE_ALLOCA_H 1*/

@@ -105,7 +110,7 @@
#define HAVE_MALLOC_H 1

/* Define if you have the <arpa/inet.h> header file.  */
#define HAVE_ARPA_INET_H 1
/* #define HAVE_ARPA_INET_H 1 */

/* Define if you have the <crypto.h> header file.  */
/* #undef HAVE_CRYPTO_H */
@@ -123,7 +128,7 @@
/* #undef HAVE_GETOPT_H */

/* Define if you have the <netdb.h> header file.  */
#define HAVE_NETDB_H 1
/* #define HAVE_NETDB_H 1 */

/* Define if you have the <netinet/in.h> header file.  */
/*#define HAVE_NETINET_IN_H 1*/
@@ -144,19 +149,22 @@
/*#define HAVE_SYS_SOCKET_H 1*/

/* Define if you have the <sys/sockio.h> header file.  */
#define HAVE_SYS_SOCKIO_H 1
/* #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/utime.h> header file */
#define HAVE_SYS_UTIME_H 1

/* 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 HAVE_TERMIO_H 1 */

/* Define if you have the <termios.h> 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 <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

@@ -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 <unistd.h> header file.  */
#define HAVE_UNISTD_H 1
+1 −1
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@
#ifdef WIN32
#define HAVE_IOCTLSOCKET
#include <windows.h>
#include <winsock.h>
#define EINPROGRESS WSAEINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EISCONN     WSAEISCONN
#define ENOTSOCK    WSAENOTSOCK
#define ECONNREFUSED WSAECONNREFUSED
#endif

#include "urldata.h"
+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@
#include <errno.h>

#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
#include <winsock.h>
#include <time.h>
#include <io.h>
#else
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@
#include "strequal.h"

#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
#include <winsock.h>
#include <time.h>
#include <io.h>
#else
+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@
#include <errno.h>

#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
#include <winsock.h>
#include <time.h>
#include <io.h>
#include <fcntl.h>
Loading