diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-21 23:08:04 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-21 23:08:04 +0000 |
| commit | 6d41dd5180fa5d8c308eff93bc89efbfb8028151 (patch) | |
| tree | 311c0e6adb74bdcb08374f0cf26bcad8e04d9a06 /include/apr.hnw | |
| parent | 38546e39396bf4dde4c1d96e064dc26b3aabe376 (diff) | |
| download | apr-6d41dd5180fa5d8c308eff93bc89efbfb8028151.tar.gz | |
Fixed issue when compiling serf due to odd defines.
The NetWare winsock2 header defines accept which breaks
compilation of serf lib, therefore we now undef.
Also removed obsolete include of novsock2.h in libprews.c.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1084016 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr.hnw')
| -rw-r--r-- | include/apr.hnw | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/apr.hnw b/include/apr.hnw index b9833ab85..0dc0c536f 100644 --- a/include/apr.hnw +++ b/include/apr.hnw @@ -49,6 +49,11 @@ #include <signal.h> #ifdef USE_WINSOCK #include <novsock2.h> +/* The NetWare Winsock2 header novsock2.h has macros which define + * accept and connect, but these clash with serf, so we undef them + */ +#undef accept +#undef connect #ifdef NW_BUILD_IPV6 #include <novtcpip.h> #endif @@ -223,11 +228,11 @@ extern "C" { #define APR_CHARSET_EBCDIC 0 /* Is the TCP_NODELAY socket option inherited from listening sockets? -*/ + */ #define APR_TCP_NODELAY_INHERITED 1 /* Is the O_NONBLOCK flag inherited from listening sockets? -*/ + */ #define APR_O_NONBLOCK_INHERITED 1 /* Typedefs that APR needs. */ |