diff options
| author | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 23:08:04 +0000 |
|---|---|---|
| committer | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 23:08:04 +0000 |
| commit | 0d0f175a5d0eb63225cbe4128d21d93a0c36f7e6 (patch) | |
| tree | 3be980163018b212a5dba4612af169e09b172537 | |
| parent | 36dcd849df537082f6e21849c7e0b1e396005f60 (diff) | |
| download | libapr-0d0f175a5d0eb63225cbe4128d21d93a0c36f7e6.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: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@1084016 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.hnw | 8 | ||||
| -rw-r--r-- | misc/netware/libprews.c | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/apr.hnw b/include/apr.hnw index 919e058cb..7e9ce26cf 100644 --- a/include/apr.hnw +++ b/include/apr.hnw @@ -53,11 +53,15 @@ #include <nks/time.h> #include <signal.h> #include <novsock2.h> -#include <sys/types.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 +#include <sys/types.h> #define _POSIX_THREAD_SAFE_FUNCTIONS 1 #define READDIR_IS_THREAD_SAFE 1 diff --git a/misc/netware/libprews.c b/misc/netware/libprews.c index a26629e99..7210ae648 100644 --- a/misc/netware/libprews.c +++ b/misc/netware/libprews.c @@ -16,7 +16,6 @@ #include <netware.h> #include <library.h> #include <nks/synch.h> -#include "novsock2.h" #include "apr_pools.h" #include "apr_private.h" |