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 02:23:12 UTC
svn commit: r1084046 - in /apr/apr: branches/0.9.x/include/apr.hnw
branches/1.3.x/include/apr.hnw branches/1.4.x/include/apr.hnw
branches/1.5.x/include/apr.hnw trunk/include/apr.hnw
Author: fuankg
Date: Tue Mar 22 01:23:11 2011
New Revision: 1084046
URL: http://svn.apache.org/viewvc?rev=1084046&view=rev
Log:
Reverted undef hack from r1084016 - needs more testing.
Modified:
apr/apr/branches/0.9.x/include/apr.hnw
apr/apr/branches/1.3.x/include/apr.hnw
apr/apr/branches/1.4.x/include/apr.hnw
apr/apr/branches/1.5.x/include/apr.hnw
apr/apr/trunk/include/apr.hnw
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=1084046&r1=1084045&r2=1084046&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/include/apr.hnw (original)
+++ apr/apr/branches/0.9.x/include/apr.hnw Tue Mar 22 01:23:11 2011
@@ -53,11 +53,6 @@
#include <nks/time.h>
#include <signal.h>
#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/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.hnw?rev=1084046&r1=1084045&r2=1084046&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.hnw (original)
+++ apr/apr/branches/1.3.x/include/apr.hnw Tue Mar 22 01:23:11 2011
@@ -55,11 +55,6 @@
#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/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hnw?rev=1084046&r1=1084045&r2=1084046&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.hnw (original)
+++ apr/apr/branches/1.4.x/include/apr.hnw Tue Mar 22 01:23:11 2011
@@ -55,11 +55,6 @@
#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/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr.hnw?rev=1084046&r1=1084045&r2=1084046&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr.hnw (original)
+++ apr/apr/branches/1.5.x/include/apr.hnw Tue Mar 22 01:23:11 2011
@@ -55,11 +55,6 @@
#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/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=1084046&r1=1084045&r2=1084046&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Tue Mar 22 01:23:11 2011
@@ -49,11 +49,6 @@
#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