Commit e40392ac authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Andrés García's patch to prevent warnings while compiling with mingw, mainly 

because it is now possible to have both WIN32 and HAVE_CONFIG_H defined.
parent 1eb9fd6c

lib/connect.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
#endif



#ifdef WIN32

#define HAVE_IOCTLSOCKET

#include <windows.h>

#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK

lib/setup.h

+5 −4
Original line number Diff line number Diff line
@@ -39,16 +39,17 @@ 


#ifdef HAVE_CONFIG_H

#include "config.h" /* the configure script results */

#else

#ifdef WIN32

/* hand-modified win32 config.h! */

#include "config-win32.h"

#endif

#endif



#ifdef VMS

/* hand-modified VMS config.h! */

#include "config-vms.h"

#endif

#ifdef WIN32

/* hand-modified win32 config.h! */

#include "config-win32.h"

#endif

#ifdef macintosh

/* hand-modified MacOS config.h! */

#include "config-mac.h"