commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1147818 - in /commons/sandbox/runtime/trunk/src/main/native: configure os/linux/epoll.c
Date Mon, 18 Jul 2011 11:44:21 GMT
Author: mturk
Date: Mon Jul 18 11:44:20 2011
New Revision: 1147818

URL: http://svn.apache.org/viewvc?rev=1147818&view=rev
Log:
Allow additional includes in have_include test

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure
    commons/sandbox/runtime/trunk/src/main/native/os/linux/epoll.c

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1147818&r1=1147817&r2=1147818&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Jul 18 11:44:20 2011
@@ -120,7 +120,7 @@ has_openssl_static=no
 openssl_home="$OPENSSL_HOME"
 openssl_inc=""
 openssl_lib=""
-cccinc="stdio"
+cccinc="unistd"
 mmake="make"
 makefiles=Makefile.in
 cc_ver_major=0
@@ -915,8 +915,11 @@ have_include()
     do_printf 'Checking for %-32s' "<$1.h>"
     cat > $cccsrc.c << EOF
 #include <stdlib.h>
-#include <sys/types.h>
-$2
+#include <$cccinc.h>
+EOF
+test ".$2" != "." && echo '#include <'$2'.h>' >> $cccsrc.c
+test ".$3" != "." && echo '#include <'$3'.h>' >> $cccsrc.c
+    cat >> $cccsrc.c << EOF
 #include <$1.h>
 int main() {return 0;}
 EOF
@@ -1350,7 +1353,7 @@ extern "C" {
 #define HAVE_LIMITS_H           `have_include limits`
 #define HAVE_NETDB_H            `have_include netdb`
 #define HAVE_NETINET_IN_H       `have_include netinet/in`
-#define HAVE_NETINET_TCP_H      `have_include netinet/tcp`
+#define HAVE_NETINET_TCP_H      `have_include netinet/tcp netinet/in`
 #define HAVE_ARPA_INET_H        `have_include arpa/inet`
 #define HAVE_RESOLV_H           `have_include resolv`
 #define HAVE_IFADDRS_H          `have_include ifaddrs`

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/epoll.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/epoll.c?rev=1147818&r1=1147817&r2=1147818&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/epoll.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/epoll.c Mon Jul 18 11:44:20 2011
@@ -51,13 +51,13 @@ struct pfd_elem_t {
 };
 
 typedef struct acr_pollset_t {
-    /* A ring containing all of the pollfd_t that are active
+    /* A ring containing all of the pfd_elem_t that are active
      */
     ACR_RING_HEAD(pfd_eset_ring_t, pfd_elem_t) eset_ring;
-    /* A ring of pollfd_t that have been used, and then deleted
+    /* A ring of pfd_elem_t that have been used, and then deleted
      */
     ACR_RING_HEAD(pfd_free_ring_t, pfd_elem_t) free_ring;
-    /* A ring of pollfd_t where rings that have been deleted but
+    /* A ring of pfd_elem_t where rings that have been deleted but
      * might still be inside a _epoll()
      */
     ACR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;



Mime
View raw message