summaryrefslogtreecommitdiff
path: root/include/wsockcompat.h
diff options
context:
space:
mode:
authorAron Xu <aron@debian.org>2012-05-25 04:03:35 +0000
committerAron Xu <aron@debian.org>2012-05-25 04:03:35 +0000
commitd7372d053bbd1d58216fbb04d1771ffa4cc3e624 (patch)
tree62b661911406394bbeaca8951d660bb6d8aac0de /include/wsockcompat.h
parent2d1849b271fa8697b88d07ba7d78dc83591e1363 (diff)
downloadlibxml2-upstream/2.8.0+dfsg1.tar.gz
Imported Upstream version 2.8.0+dfsg1upstream/2.8.0+dfsg1
Diffstat (limited to 'include/wsockcompat.h')
-rw-r--r--include/wsockcompat.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
index f4bdab4..c762a64 100644
--- a/include/wsockcompat.h
+++ b/include/wsockcompat.h
@@ -27,7 +27,7 @@
#endif
#endif
-#ifdef __MINGW32__
+#if defined( __MINGW32__ ) || defined( _MSC_VER )
/* Include <errno.h> here to ensure that it doesn't get included later
* (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
#include <errno.h>
@@ -39,6 +39,9 @@
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ESHUTDOWN WSAESHUTDOWN
+
+#ifndef _MSC_VER
#define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY
#define ENOTSOCK WSAENOTSOCK
@@ -61,7 +64,6 @@
#define ENOBUFS WSAENOBUFS
#define EISCONN WSAEISCONN
#define ENOTCONN WSAENOTCONN
-#define ESHUTDOWN WSAESHUTDOWN
#define ETOOMANYREFS WSAETOOMANYREFS
#define ETIMEDOUT WSAETIMEDOUT
#define ECONNREFUSED WSAECONNREFUSED
@@ -79,5 +81,6 @@
#define ENAMETOOLONG WSAENAMETOOLONG
#define ENOTEMPTY WSAENOTEMPTY
*/
+#endif /* _MSC_VER */
#endif /* __XML_WSOCKCOMPAT_H__ */