apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r982038 - in /apr/apr/trunk: NWGNUmakefile build/NWGNUenvironment.inc include/apr.hnw include/arch/netware/apr_private.h network_io/win32/sendrecv.c
Date Tue, 03 Aug 2010 21:30:22 GMT
Author: fuankg
Date: Tue Aug  3 21:30:22 2010
New Revision: 982038

URL: http://svn.apache.org/viewvc?rev=982038&view=rev
Log:
Some more NetWare build fixes.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/include/apr.hnw
    apr/apr/trunk/include/arch/netware/apr_private.h
    apr/apr/trunk/network_io/win32/sendrecv.c

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=982038&r1=982037&r2=982038&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Tue Aug  3 21:30:22 2010
@@ -42,6 +42,7 @@ XINCDIRS	+= \
 			$(APR)/dbm/sdbm \
 			$(APR)/memory/unix \
 			$(APR)/random/unix \
+			$(LDAPSDK)/inc \
 			$(EOLIST)
 
 #
@@ -405,6 +406,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/uuid.o \
 	$(OBJDIR)/version.o \
 	$(OBJDIR)/waitio.o \
+	$(OBJDIR)/wakeup.o \
 	$(OBJDIR)/xlate.o \
 	$(EOLIST)
 

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=982038&r1=982037&r2=982038&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Tue Aug  3 21:30:22 2010
@@ -237,7 +237,7 @@ endif
 # Add support for building IPV6 alongside
 ifneq "$(IPV6)" ""
 DEFINES += -DNW_BUILD_IPV6
-INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
+# INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
 
 ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
 OBJDIR := $(OBJDIR)_IPV6

Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=982038&r1=982037&r2=982038&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Tue Aug  3 21:30:22 2010
@@ -38,6 +38,7 @@
 
 #if defined(NETWARE) || defined(DOXYGEN)
 
+#undef  FD_SETSIZE
 #define FD_SETSIZE 1024
 
 #include <sys/types.h>

Modified: apr/apr/trunk/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/netware/apr_private.h?rev=982038&r1=982037&r2=982038&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/netware/apr_private.h (original)
+++ apr/apr/trunk/include/arch/netware/apr_private.h Tue Aug  3 21:30:22 2010
@@ -89,8 +89,10 @@
 /* 7 is used for SIGPOLL on netware */
 
 #define SIGKILL         11
+#undef  SA_NOCLDSTOP
 #define SA_NOCLDSTOP    12
 #define SIGALRM         13
+#undef  SIGCHLD
 #define SIGCHLD         14 
 #define SIGCONT         15
 #define SIGHUP          16
@@ -105,6 +107,7 @@
     
 #define SIGTRAP         25
 #define SIGIOT          26
+#undef  SIGBUS
 #define SIGBUS          27
 #define SIGSTKFLT       28
 #define SIGURG          29
@@ -115,29 +118,15 @@
 #define SIGWINCH        34
 #define SIGIO           35
 
-#if 0
-#define __attribute__(__x) 
-
-/* APR COMPATABILITY FUNCTIONS
- * This section should be used to define functions and
- * macros which are need to make Windows features look
- * like POSIX features.
- */
-typedef void (Sigfunc)(int);
-#endif
-
-#define strcasecmp(s1, s2)       stricmp(s1, s2)
-#define Sleep(t)                 delay(t)
-#define lstat(a,b)               stat(a,b)
-#define _getch()                 getcharacter()
+#define _getch()               getcharacter()
 
+#define SIZEOF_CHAR            1
 #define SIZEOF_SHORT           2
 #define SIZEOF_INT             4
 #define SIZEOF_LONGLONG        8
-#define SIZEOF_CHAR            1
 #define SIZEOF_SSIZE_T         SIZEOF_INT
 
-void netware_pool_proc_cleanup ();
+void netware_pool_proc_cleanup();
 
 /* NLM registration routines for managing which NLMs
     are using the library. */

Modified: apr/apr/trunk/network_io/win32/sendrecv.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/win32/sendrecv.c?rev=982038&r1=982037&r2=982038&view=diff
==============================================================================
--- apr/apr/trunk/network_io/win32/sendrecv.c (original)
+++ apr/apr/trunk/network_io/win32/sendrecv.c Tue Aug  3 21:30:22 2010
@@ -455,3 +455,8 @@ APR_DECLARE(apr_status_t) apr_socket_sen
 
 #endif
 
+APR_DECLARE(apr_status_t) apr_socket_wait(apr_socket_t *sock, apr_wait_type_t direction)
+{
+    return APR_ENOTIMPL;
+}
+



Mime
View raw message