commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r888744 - in /commons/sandbox/runtime/trunk/src/main/native: configure os/linux/fasync.c
Date Wed, 09 Dec 2009 09:15:54 GMT
Author: mturk
Date: Wed Dec  9 09:15:53 2009
New Revision: 888744

URL: http://svn.apache.org/viewvc?rev=888744&view=rev
Log:
Axe the libaio. We'll use posix aio

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure
    commons/sandbox/runtime/trunk/src/main/native/os/linux/fasync.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=888744&r1=888743&r2=888744&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Wed Dec  9 09:15:53 2009
@@ -979,7 +979,6 @@
 if [ ".$host" = .windows ]; then
     have_ktmw32=`have_include 1 ktmw32`
     have_aio=0
-    have_libaio=0
     have_windows=1
     have_uuid_uuid=0
     have_off64t=0
@@ -989,11 +988,6 @@
     sizeof_off64_t=`check_sizeof off64_t 0`
     test ".$sizeof_off64_t" = .0 && have_off64t=0
     have_aio=`have_include 0 aio`
-    have_libaio=`have_include 0 libaio`
-    if [ ".$have_libaio" = .1 ]; then
-        have_libaio=`have_library aio io_setup`
-        test ".$have_libaio" = .1 && varadds ldflags -laio
-    fi
     have_windows=0
     have_uuid_uuid=`have_include 0 uuid/uuid`
     if [ ".$have_uuid_uuid" = .1 ]; then
@@ -1139,7 +1133,6 @@
 #define HAVE_WINDOWS_H        $have_windows
 #define HAVE_KTMW32_H         $have_ktmw32
 #define HAVE_AIO_H            $have_aio
-#define HAVE_LIBAIO_H         $have_libaio
 #define HAVE_UUID_UUID_H      $have_uuid_uuid
 #define HAVE_OPENSSL          $have_openssl
 #define HAVE_OCSP             $have_ocsp

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/fasync.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/fasync.c?rev=888744&r1=888743&r2=888744&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/fasync.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/fasync.c Wed Dec  9 09:15:53 2009
@@ -28,9 +28,8 @@
 
 /* AIO support
  */
-#if HAVE_LIBAIO_H
-#include <sys/time.h>
-#include <libaio.h>
+#if HAVE_AIO_H
+#include <aio.h>
 
 ACR_IO_EXPORT_DECLARE(jboolean, FileSystemIo, aio0)(ACR_JNISTDARGS)
 {
@@ -44,4 +43,4 @@
     return JNI_FALSE;    
 }
 
-#endif /* HAVE_LIBAIO_H */
+#endif /* HAVE_AIO_H */



Mime
View raw message