svn commit: r748253 - in /apr/apr/trunk: build/make_nw_export.awk include/apr.hnw poll/unix/select.c

[bn...@apache.org]

Author: bnicholes
Date: Thu Feb 26 18:13:38 2009
New Revision: 748253

URL: http://svn.apache.org/viewvc?rev=748253&view=rev
Log:
Fix netware build errors

Modified:
    apr/apr/trunk/build/make_nw_export.awk
    apr/apr/trunk/include/apr.hnw
    apr/apr/trunk/poll/unix/select.c

Modified: apr/apr/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/make_nw_export.awk?rev=748253&r1=748252&r2=748253&view=diff
==============================================================================
--- apr/apr/trunk/build/make_nw_export.awk (original)
+++ apr/apr/trunk/build/make_nw_export.awk Thu Feb 26 18:13:38 2009
@@ -8,6 +8,8 @@
 # List of functions that we don't support, yet??
 #/apr_##name##_set_inherit/{next}
 #/apr_##name##_unset_inherit/{next}
+#/apr_##name##_perms_set/{next}
+/apr_socket_perms_set/{next}
 
 
 function add_symbol (sym_name) {
@@ -65,6 +67,13 @@
     next
 }
 
+#/^[ \t]*APR_PERMS_SET_IMPLEMENT[^(]*[(][^)]*[)]/ {
+#    sub("[ \t]*APR_PERMS_SET_IMPLEMENT[^(]*[(]", "", $0)
+#    sub("[)].*$", "", $0)
+#    add_symbol("apr_" $0 "_perms_set")
+#    next
+#}
+
 /^[ \t]*AP[RUI]?_DECLARE_DATA .*;$/ {
        varname = $NF;
        gsub( /[*;]/, "", varname);

Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=748253&r1=748252&r2=748253&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Thu Feb 26 18:13:38 2009
@@ -120,15 +120,16 @@
 #define APR_HAVE_SYS_SOCKET_H   0
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_TIME_H     0
+#define APR_HAVE_SYS_UN_H       0
 #else
 #define APR_HAVE_SYS_SOCKET_H   1
 #define APR_HAVE_SYS_SOCKIO_H   1
 #define APR_HAVE_SYS_TIME_H     1
+#define APR_HAVE_SYS_UN_H       1
 #endif
 #define APR_HAVE_SYS_SIGNAL_H   1
 #define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      1
-#define APR_HAVE_SYS_UN_H       1
 #define APR_HAVE_SYS_WAIT_H     1
 #define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       1
@@ -178,7 +179,11 @@
 #else
 #define APR_HAVE_IPV6           0
 #endif
+#ifdef USE_WINSOCK
 #define APR_HAVE_SOCKADDR_UN    0
+#else
+#define APR_HAVE_SOCKADDR_UN    1
+#endif
 #define APR_HAVE_MEMCHR         1
 #define APR_HAVE_MEMMOVE        1
 #define APR_HAVE_SETRLIMIT      0

Modified: apr/apr/trunk/poll/unix/select.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/select.c?rev=748253&r1=748252&r2=748253&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/select.c (original)
+++ apr/apr/trunk/poll/unix/select.c Thu Feb 26 18:13:38 2009
@@ -241,8 +241,8 @@
 #else
 #ifdef NETWARE
         /* NetWare can't handle mixed descriptor types in select() */
-        if (descriptor->desc.f->is_pipe && !HAS_SOCKETS(pollset->set_type)) {
-            pollset->set_type = APR_POLL_FILE;
+        if (descriptor->desc.f->is_pipe && !HAS_SOCKETS(pollset->p->set_type)) {
+            pollset->p->set_type = APR_POLL_FILE;
             fd = descriptor->desc.f->filedes;
         }
         else {
@@ -357,7 +357,7 @@
     memcpy(&exceptset, &(pollset->p->exceptset), sizeof(fd_set));
 
 #ifdef NETWARE
-    if (HAS_PIPES(ppollset->p->set_type)) {
+    if (HAS_PIPES(pollset->p->set_type)) {
         rs = pipe_select(pollset->p->maxfd + 1, &readset, &writeset, &exceptset,
                          tvptr);
     }