You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/11/17 20:46:39 UTC
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
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 @@
/**
* <code><pre>
- * void bzero(void *ptr, size_t len)
- * </pre></code>
- */
- public static final native void bzero(
- @JniArg(cast = "void *") long ptr,
- long len);
-
- /**
- * <code><pre>
* void free(void *ptr);
* </pre></code>
*/
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, ...);
* </pre></code>
*/
+ @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);
* </pre></code>
*/
+ @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 <sys/errno.h> header file.])])
AC_CHECK_HEADER([sys/stat.h],[AC_DEFINE([HAVE_SYS_STAT_H], [1], [Define to 1 if you have the <sys/stat.h> header file.])])