Andrs Garca's patch to prevent warnings while compiling with mingw, mainly
because it is now possible to have both WIN32 and HAVE_CONFIG_H defined.
This commit is contained in:
parent
1eb9fd6c4d
commit
e40392ac03
@ -68,7 +68,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define HAVE_IOCTLSOCKET
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#define EINPROGRESS WSAEINPROGRESS
|
#define EINPROGRESS WSAEINPROGRESS
|
||||||
#define EWOULDBLOCK WSAEWOULDBLOCK
|
#define EWOULDBLOCK WSAEWOULDBLOCK
|
||||||
|
@ -39,16 +39,17 @@
|
|||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h" /* the configure script results */
|
#include "config.h" /* the configure script results */
|
||||||
|
#else
|
||||||
|
#ifdef WIN32
|
||||||
|
/* hand-modified win32 config.h! */
|
||||||
|
#include "config-win32.h"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VMS
|
#ifdef VMS
|
||||||
/* hand-modified VMS config.h! */
|
/* hand-modified VMS config.h! */
|
||||||
#include "config-vms.h"
|
#include "config-vms.h"
|
||||||
#endif
|
#endif
|
||||||
#ifdef WIN32
|
|
||||||
/* hand-modified win32 config.h! */
|
|
||||||
#include "config-win32.h"
|
|
||||||
#endif
|
|
||||||
#ifdef macintosh
|
#ifdef macintosh
|
||||||
/* hand-modified MacOS config.h! */
|
/* hand-modified MacOS config.h! */
|
||||||
#include "config-mac.h"
|
#include "config-mac.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user