You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/03/22 00:08:05 UTC
svn commit: r1084016 - in /apr/apr: branches/0.9.x/include/
branches/0.9.x/misc/netware/ branches/1.3.x/include/
branches/1.3.x/misc/netware/ branches/1.4.x/include/
branches/1.4.x/misc/netware/ branches/1.5.x/include/
branches/1.5.x/misc/netware/ trun...
Author: fuankg
Date: Mon Mar 21 23:08:04 2011
New Revision: 1084016
URL: http://svn.apache.org/viewvc?rev=1084016&view=rev
Log:
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.
Modified:
apr/apr/branches/0.9.x/include/apr.hnw
apr/apr/branches/0.9.x/misc/netware/libprews.c
apr/apr/branches/1.3.x/include/apr.hnw
apr/apr/branches/1.3.x/misc/netware/libprews.c
apr/apr/branches/1.4.x/include/apr.hnw
apr/apr/branches/1.4.x/misc/netware/libprews.c
apr/apr/branches/1.5.x/include/apr.hnw
apr/apr/branches/1.5.x/misc/netware/libprews.c
apr/apr/trunk/include/apr.hnw
apr/apr/trunk/misc/netware/libprews.c
Modified: apr/apr/branches/0.9.x/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/include/apr.hnw?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/include/apr.hnw (original)
+++ apr/apr/branches/0.9.x/include/apr.hnw Mon Mar 21 23:08:04 2011
@@ -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
Modified: apr/apr/branches/0.9.x/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/misc/netware/libprews.c?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/misc/netware/libprews.c (original)
+++ apr/apr/branches/0.9.x/misc/netware/libprews.c Mon Mar 21 23:08:04 2011
@@ -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"
Modified: apr/apr/branches/1.3.x/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.hnw?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.hnw (original)
+++ apr/apr/branches/1.3.x/include/apr.hnw Mon Mar 21 23:08:04 2011
@@ -55,6 +55,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
Modified: apr/apr/branches/1.3.x/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/misc/netware/libprews.c?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/misc/netware/libprews.c (original)
+++ apr/apr/branches/1.3.x/misc/netware/libprews.c Mon Mar 21 23:08:04 2011
@@ -16,9 +16,6 @@
#include <netware.h>
#include <library.h>
#include <nks/synch.h>
-#ifdef USE_WINSOCK
-#include "novsock2.h"
-#endif
#include "apr_pools.h"
#include "apr_private.h"
Modified: apr/apr/branches/1.4.x/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hnw?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.hnw (original)
+++ apr/apr/branches/1.4.x/include/apr.hnw Mon Mar 21 23:08:04 2011
@@ -55,6 +55,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
Modified: apr/apr/branches/1.4.x/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/misc/netware/libprews.c?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/misc/netware/libprews.c (original)
+++ apr/apr/branches/1.4.x/misc/netware/libprews.c Mon Mar 21 23:08:04 2011
@@ -16,9 +16,6 @@
#include <netware.h>
#include <library.h>
#include <nks/synch.h>
-#ifdef USE_WINSOCK
-#include "novsock2.h"
-#endif
#include "apr_pools.h"
#include "apr_private.h"
Modified: apr/apr/branches/1.5.x/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr.hnw?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr.hnw (original)
+++ apr/apr/branches/1.5.x/include/apr.hnw Mon Mar 21 23:08:04 2011
@@ -55,6 +55,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
Modified: apr/apr/branches/1.5.x/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/misc/netware/libprews.c?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/misc/netware/libprews.c (original)
+++ apr/apr/branches/1.5.x/misc/netware/libprews.c Mon Mar 21 23:08:04 2011
@@ -16,9 +16,6 @@
#include <netware.h>
#include <library.h>
#include <nks/synch.h>
-#ifdef USE_WINSOCK
-#include "novsock2.h"
-#endif
#include "apr_pools.h"
#include "apr_private.h"
Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Mon Mar 21 23:08:04 2011
@@ -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. */
Modified: apr/apr/trunk/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/netware/libprews.c?rev=1084016&r1=1084015&r2=1084016&view=diff
==============================================================================
--- apr/apr/trunk/misc/netware/libprews.c (original)
+++ apr/apr/trunk/misc/netware/libprews.c Mon Mar 21 23:08:04 2011
@@ -16,9 +16,6 @@
#include <netware.h>
#include <library.h>
#include <nks/synch.h>
-#ifdef USE_WINSOCK
-#include <novsock2.h>
-#endif
#include "apr_pools.h"
#include "apr_private.h"