Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 44681 invoked from network); 17 Nov 2009 19:47:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Nov 2009 19:47:11 -0000 Received: (qmail 28871 invoked by uid 500); 17 Nov 2009 19:47:11 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 28834 invoked by uid 500); 17 Nov 2009 19:47:11 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 28825 invoked by uid 99); 17 Nov 2009 19:47:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 19:47:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 19:47:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9A63523888FD; Tue, 17 Nov 2009 19:46:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881462 - in /activemq/sandbox/activemq-apollo/activemq-syscall/src/main: java/org/apache/activemq/syscall/CLibrary.java java/org/apache/activemq/syscall/IO.java java/org/apache/activemq/syscall/Posix.java native-package/configure.ac Date: Tue, 17 Nov 2009 19:46:39 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091117194639.9A63523888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Tue Nov 17 19:46:39 2009 New Revision: 881462 URL: http://svn.apache.org/viewvc?rev=881462&view=rev Log: adding more conditionals Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/CLibrary.java activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/Posix.java activemq/sandbox/activemq-apollo/activemq-syscall/src/main/native-package/configure.ac Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/CLibrary.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/CLibrary.java?rev=881462&r1=881461&r2=881462&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/CLibrary.java (original) +++ activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/CLibrary.java Tue Nov 17 19:46:39 2009 @@ -94,15 +94,6 @@ /** * 
-     * void bzero(void *ptr, size_t len)
-     *
- */ - public static final native void bzero( - @JniArg(cast = "void *") long ptr, - long len); - - /** - * 
      * void free(void *ptr);
      *
*/ Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java?rev=881462&r1=881461&r2=881462&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java (original) +++ activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java Tue Nov 17 19:46:39 2009 @@ -173,6 +173,7 @@ * int fcntl(int fd, int cmd, ...); * */ + @JniMethod(conditional="#ifdef HAVE_FCNTL_FUNCTION") public static final native int fcntl(int fd, int cmd); Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/Posix.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/Posix.java?rev=881462&r1=881461&r2=881462&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/Posix.java (original) +++ activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/Posix.java Tue Nov 17 19:46:39 2009 @@ -18,6 +18,7 @@ import org.fusesource.hawtjni.runtime.JniArg; import org.fusesource.hawtjni.runtime.JniClass; +import org.fusesource.hawtjni.runtime.JniMethod; /** * @@ -31,6 +32,7 @@ * int posix_memalign(void **ptrRef, size_t alignment, size_t len); * */ + @JniMethod(conditional="#ifdef HAVE_POSIX_MEMALIGN_FUNCTION") public static final native int posix_memalign( @JniArg(cast="void **") long ptrRef[], @JniArg(cast="size_t") long alignment, Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/native-package/configure.ac URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/native-package/configure.ac?rev=881462&r1=881461&r2=881462&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo/activemq-syscall/src/main/native-package/configure.ac (original) +++ activemq/sandbox/activemq-apollo/activemq-syscall/src/main/native-package/configure.ac Tue Nov 17 19:46:39 2009 @@ -52,6 +52,9 @@ done ]) +AC_CHECK_LIB([c], [fcntl],[AC_DEFINE([HAVE_FCNTL_FUNCTION], [1], [Define to 1 if you have the fcntl function.])]) +AC_CHECK_LIB([c], [posix_memalign],[AC_DEFINE([HAVE_POSIX_MEMALIGN_FUNCTION], [1], [Define to 1 if you have the posix_memalign function.])]) + AC_CHECK_HEADER([sys/errno.h],[AC_DEFINE([HAVE_SYS_ERRNO_H], [1], [Define to 1 if you have the header file.])]) AC_CHECK_HEADER([sys/stat.h],[AC_DEFINE([HAVE_SYS_STAT_H], [1], [Define to 1 if you have the header file.])])