Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Unified Diff: third_party/libxml/src/include/wsockcompat.h

Issue 1193533007: Upgrade to libxml 2.9.2 and libxslt 1.1.28 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no iconv Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libxml/src/include/win32config.h ('k') | third_party/libxml/src/install-sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libxml/src/include/wsockcompat.h
diff --git a/third_party/libxml/src/include/wsockcompat.h b/third_party/libxml/src/include/wsockcompat.h
index f4bdab4b6db2a288b0df168ff8c152ade5c04637..e6a1a993e77958971d42940e211b69daa89145b8 100644
--- a/third_party/libxml/src/include/wsockcompat.h
+++ b/third_party/libxml/src/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
+
+#if (!defined(_MSC_VER) || (_MSC_VER < 1600))
#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__ */
« no previous file with comments | « third_party/libxml/src/include/win32config.h ('k') | third_party/libxml/src/install-sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698