commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1099353 - in /commons/sandbox/runtime/trunk/src/main/native: configure configure.bat include/acr/stdinc.h os/win32/config.hw
Date Wed, 04 May 2011 07:47:00 GMT
Author: mturk
Date: Wed May  4 07:47:00 2011
New Revision: 1099353

URL: http://svn.apache.org/viewvc?rev=1099353&view=rev
Log:
Axe enable-ipv6. We'll use runtime detection

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure
    commons/sandbox/runtime/trunk/src/main/native/configure.bat
    commons/sandbox/runtime/trunk/src/main/native/include/acr/stdinc.h
    commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1099353&r1=1099352&r2=1099353&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Wed May  4 07:47:00 2011
@@ -117,7 +117,6 @@ has_shared_version=no
 has_zlib_asm=yes
 has_openssl=no
 has_openssl_static=no
-has_ipv6=no
 openssl_home="$OPENSSL_HOME"
 openssl_inc=""
 openssl_lib=""
@@ -776,7 +775,6 @@ else
     fi
 fi
 
-test ".$has_ipv6" = .yes && varadds cppopts -DENABLE_IPV6
 trap 'rm -f $cccsrc ; trap 2 ; kill -2 $$' 1 2 3 13 15
 trap 'rm -f $cccsrc' 0
 
@@ -1265,6 +1263,7 @@ extern "C" {
 #define HAVE_NETINET_IN_H       `have_include 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`
 #define HAVE_SYS_UN_H           `have_include sys/un`
 #define HAVE_SEMAPHORE_H        `have_include semaphore`
 #define HAVE_UCONTEXT_H         `have_include ucontext`
@@ -1341,8 +1340,16 @@ extern "C" {
 #define HAVE_STRTOULL           `have_function x strtoull`
 #define HAVE_STRTONUM           `have_function x strtonum`
 #define HAVE_SHM_OPEN           `have_function x shm_open`
+#define HAVE_GETHOSTBYADDR_R    `have_function x gethostbyaddr_r`
+#define HAVE_GETHOSTBYNAME2     `have_function x gethostbyname2`
+#define HAVE_GETHOSTBYNAME_R    `have_function x gethostbyname_r`
+#define HAVE_GETHOSTENT         `have_function x gethostent`
+#define HAVE_GETHOSTENT_R       `have_function x gethostent_r`
+#define HAVE_GETSERVBYNAME_R    `have_function x getservbyname_r`
+#define HAVE_GETIFADDRS         `have_function x getifaddrs`
 #define HAVE_SOCK_CLOEXEC       `have_defined SOCK_CLOEXEC`
 #define HAVE_FILE_CLOEXEC       `have_defined O_CLOEXEC`
+#define HAVE_SO_ACCEPTFILTER    `have_defined SO_ACCEPTFILTER`
 #define HAVE_TM_TM_GMTOFF       `have_strcut_member time 'struct tm' tm_gmtoff`
 #define HAVE_DIRENT_D_INO       `have_strcut_member dirent 'struct dirent' d_ino`
 #define HAVE_DIRENT_D_FILENO    `have_strcut_member dirent 'struct dirent' d_fileno`

Modified: commons/sandbox/runtime/trunk/src/main/native/configure.bat
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.bat?rev=1099353&r1=1099352&r2=1099353&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.bat (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.bat Wed May  4 07:47:00 2011
@@ -96,7 +96,6 @@ goto TargetAll
 :TargetAll
 set ENABLE_TESTP=0
 set ENABLE_DEBUG=0
-set ENABLE_IPV6=0
 set HAVE_OPENSSL=0
 set HAVE_INTRIN_H=0
 set WITH_OPENSSL=
@@ -115,10 +114,6 @@ if "%OPTION%" == "/debug" (
   set "ENABLE_DEBUG=1"
   goto ParseOption
 )
-if "%OPTION%" == "/enable-ipv6" (
-  set "ENABLE_IPV6=1"
-  goto ParseOption
-)
 if "%OPTION%" == "/with-inirinsics" (
   set "HAVE_INTRIN_H=1"
   goto ParseOption
@@ -194,9 +189,6 @@ set RCFLAGS=%RCFLAGS% /d %MCPU% /d OCPR_
 set LDARCH=/MACHINE:%MACH%
 set ARFLAGS=/NOLOGO /MACHINE:%MACH%
 set CPPOPTS=%CPPOPTS% -D__CC%BITS%
-if %ENABLE_IPV6% == 1 (
-  set "CPPOPTS=%CPPOPTS% -DENABLE_IPV6"
-)
 if %ENABLE_TESTP% == 1 (
   set "CPPOPTS=%CPPOPTS% -DENABLE_TEST_PRIVATE"
 )
@@ -207,7 +199,6 @@ echo.
 echo OpenSSL support            %HAVE_OPENSSL%
 echo Debug                      %ENABLE_DEBUG%
 echo Test private APIenabled    %ENABLE_TESTP%
-echo IPV6 enabled               %ENABLE_IPV6%
 echo Using JDK                  %WITH_JAVA%
 
 set "CCI=.\include\acr\config_%ARCH%.h"
@@ -316,7 +307,6 @@ echo Usage configure.bat /x86^|/x64^|/i6
 echo Options can be
 echo.  /help^|/?               This page
 echo   /enable-test-private   Enable private API testsuite
-echo   /enable-ipv6           Enable IPV6 support
 echo   /debug                 Compile with DEBUG turned on
 echo   /with-openssl ^<path^>   Define path for OpenSSL library
 echo   /with-java    ^<path^>   Define path for Java SDK

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/stdinc.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/stdinc.h?rev=1099353&r1=1099352&r2=1099353&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/stdinc.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/stdinc.h Wed May  4 07:47:00
2011
@@ -186,6 +186,9 @@
 #if HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
+#if HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
 #if HAVE_LIBGEN_H
 #include <libgen.h>
 #endif

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw?rev=1099353&r1=1099352&r2=1099353&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw Wed May  4 07:47:00 2011
@@ -33,6 +33,7 @@
 #define HAVE_NETINET_IN_H       0
 #define HAVE_ARPA_INET_H        0
 #define HAVE_RESOLV_H           0
+#define HAVE_IFADDRS_H          0
 #define HAVE_SYS_UN_H           0
 #define HAVE_SEMAPHORE_H        0
 #define HAVE_UCONTEXT_H         0
@@ -107,8 +108,16 @@
 #define HAVE_STRTOULL           0
 #define HAVE_STRTONUM           0
 #define HAVE_SHM_OPEN           0
+#define HAVE_GETHOSTBYADDR_R    0
+#define HAVE_GETHOSTBYNAME2     0
+#define HAVE_GETHOSTBYNAME_R    0
+#define HAVE_GETHOSTENT         0
+#define HAVE_GETHOSTENT_R       0
+#define HAVE_GETSERVBYNAME_R    0
+#define HAVE_GETIFADDRS         0
 #define HAVE_SOCK_CLOEXEC       0
 #define HAVE_FILE_CLOEXEC       0
+#define HAVE_SO_ACCEPTFILTER    0
 #define HAVE_TM_TM_GMTOFF       0
 #define HAVE_DIRENT_D_INO       0
 #define HAVE_DIRENT_D_FILENO    0



Mime
View raw message