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 2010/08/08 19:26:15 UTC
svn commit: r983455 - in /apr/apr/trunk: build/NWGNUenvironment.inc
build/nw_export.inc include/apr.hnw ldap/NWGNUmakefile
Author: fuankg
Date: Sun Aug 8 17:26:15 2010
New Revision: 983455
URL: http://svn.apache.org/viewvc?rev=983455&view=rev
Log:
Some NetWare build fixes.
Modified:
apr/apr/trunk/build/NWGNUenvironment.inc
apr/apr/trunk/build/nw_export.inc
apr/apr/trunk/include/apr.hnw
apr/apr/trunk/ldap/NWGNUmakefile
Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=983455&r1=983454&r2=983455&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Aug 8 17:26:15 2010
@@ -154,7 +154,9 @@ NOVI = $(NOVELLLIBC)/imports
INCDIRS = $(NOVELLLIBC)/include;$(NOVELLLIBC)/include/nks;
DEFINES = -DNETWARE
-ifndef USE_STDSOCKETS
+ifdef USE_STDSOCKETS
+DEFINES += -DUSE_BSD_SOCKETS
+else
DEFINES += -DUSE_WINSOCK
INCDIRS += $(NOVELLLIBC)/include/winsock;
endif
Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.inc?rev=983455&r1=983454&r2=983455&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Sun Aug 8 17:26:15 2010
@@ -2,7 +2,6 @@
** the standard prototypes macros after it messes with them.
*/
#include "apr.h"
-#include "apu.h"
#undef APR_DECLARE
#undef APR_DECLARE_NONSTD
@@ -19,6 +18,7 @@
#include "apr_date.h"
#include "apr_dbd.h"
#include "apr_dbm.h"
+#include "apr_dbm_private.h"
#include "apr_dso.h"
#include "apr_env.h"
#include "apr_errno.h"
Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=983455&r1=983454&r2=983455&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Sun Aug 8 17:26:15 2010
@@ -49,15 +49,15 @@
#include <signal.h>
#ifdef USE_WINSOCK
#include <novsock2.h>
+#ifdef NW_BUILD_IPV6
+#include <novtcpip.h>
+#endif
#else
#include <sys/socket.h>
+#include <sys/select.h>
#endif
#include <sys/types.h>
-#ifdef NW_BUILD_IPV6
-#include <novtcpip.h>
-#endif
-
#define _POSIX_THREAD_SAFE_FUNCTIONS 1
#define READDIR_IS_THREAD_SAFE 1
Modified: apr/apr/trunk/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/NWGNUmakefile?rev=983455&r1=983454&r2=983455&view=diff
==============================================================================
--- apr/apr/trunk/ldap/NWGNUmakefile (original)
+++ apr/apr/trunk/ldap/NWGNUmakefile Sun Aug 8 17:26:15 2010
@@ -43,14 +43,6 @@ XDEFINES += \
$(EOLIST)
#
-#LDAP client requires the use of Winsock
-#
-ifdef USE_STDSOCKETS
-XDEFINES += -DUSE_WINSOCK \
- $(EOLIST)
-endif
-
-#
# These flags will be added to the link.opt file
#
XLFLAGS += \