| OLD | NEW |
|---|
| 1 /* include/wsockcompat.h | 1 /* include/wsockcompat.h |
| 2 * Windows -> Berkeley Sockets compatibility things. | 2 * Windows -> Berkeley Sockets compatibility things. |
| 3 */ | 3 */ |
| 4 | 4 |
| 5 #if !defined __XML_WSOCKCOMPAT_H__ | 5 #if !defined __XML_WSOCKCOMPAT_H__ |
| 6 #define __XML_WSOCKCOMPAT_H__ | 6 #define __XML_WSOCKCOMPAT_H__ |
| 7 | 7 |
| 8 #ifdef _WIN32_WCE | 8 #ifdef _WIN32_WCE |
| 9 #include <winsock.h> | 9 #include <winsock.h> |
| 10 #else | 10 #else |
| 11 #undef HAVE_ERRNO_H | 11 #undef HAVE_ERRNO_H |
| 12 #include <winsock2.h> | 12 #include <winsock2.h> |
| 13 | 13 |
| 14 /* the following is a workaround a problem for 'inline' keyword in said | 14 /* the following is a workaround a problem for 'inline' keyword in said |
| 15 header when compiled with Borland C++ 6 */ | 15 header when compiled with Borland C++ 6 */ |
| 16 #if defined(__BORLANDC__) && !defined(__cplusplus) | 16 #if defined(__BORLANDC__) && !defined(__cplusplus) |
| 17 #define inline __inline | 17 #define inline __inline |
| 18 #define _inline __inline |
| 18 #endif | 19 #endif |
| 19 | 20 |
| 20 #include <ws2tcpip.h> | 21 #include <ws2tcpip.h> |
| 21 | 22 |
| 22 /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */ | 23 /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */ |
| 23 #if defined(GetAddrInfo) | 24 #if defined(GetAddrInfo) |
| 25 #include <wspiapi.h> |
| 24 #define HAVE_GETADDRINFO | 26 #define HAVE_GETADDRINFO |
| 25 #endif | 27 #endif |
| 26 #endif | 28 #endif |
| 27 | 29 |
| 28 #ifdef __MINGW32__ | 30 #ifdef __MINGW32__ |
| 29 /* Include <errno.h> here to ensure that it doesn't get included later | 31 /* Include <errno.h> here to ensure that it doesn't get included later |
| 30 * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */ | 32 * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */ |
| 31 #include <errno.h> | 33 #include <errno.h> |
| 32 #undef EWOULDBLOCK | 34 #undef EWOULDBLOCK |
| 33 #endif | 35 #endif |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 #define ESTALE WSAESTALE | 74 #define ESTALE WSAESTALE |
| 73 #define EREMOTE WSAEREMOTE | 75 #define EREMOTE WSAEREMOTE |
| 74 /* These cause conflicts with the codes from errno.h. Since they are | 76 /* These cause conflicts with the codes from errno.h. Since they are |
| 75 not used in the relevant code (nanoftp, nanohttp), we can leave | 77 not used in the relevant code (nanoftp, nanohttp), we can leave |
| 76 them disabled. | 78 them disabled. |
| 77 #define ENAMETOOLONG WSAENAMETOOLONG | 79 #define ENAMETOOLONG WSAENAMETOOLONG |
| 78 #define ENOTEMPTY WSAENOTEMPTY | 80 #define ENOTEMPTY WSAENOTEMPTY |
| 79 */ | 81 */ |
| 80 | 82 |
| 81 #endif /* __XML_WSOCKCOMPAT_H__ */ | 83 #endif /* __XML_WSOCKCOMPAT_H__ */ |
| OLD | NEW |
|---|
Chromium Code Reviews
