activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r881399 - in /activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall: AIO.java IO.java
Date Tue, 17 Nov 2009 17:36:34 GMT
Author: chirino
Date: Tue Nov 17 17:36:33 2009
New Revision: 881399

URL: http://svn.apache.org/viewvc?rev=881399&view=rev
Log:
Addming more conditionals

Modified:
    activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/AIO.java
    activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/IO.java

Modified: activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/AIO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/AIO.java?rev=881399&r1=881398&r2=881399&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/AIO.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/AIO.java
Tue Nov 17 17:36:33 2009
@@ -61,7 +61,7 @@
         @JniMethod(flags={CONSTANT_INITIALIZER})
         private static final native void init();
         
-        @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct aiocb)")
+        @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct aiocb)", conditional="#ifdef
HAVE_AIO_H")
         public static int SIZEOF;
         
         public int aio_fildes;
@@ -90,9 +90,17 @@
     
     @JniClass(flags={ClassFlag.STRUCT}, conditional="#ifdef HAVE_AIO_H")
     static public class timespec {
-        
-        public static final native int timespec_sizeof ();
-        public static final int SIZEOF = timespec_sizeof();
+
+    	static {
+            CLibrary.LIBRARY.load();
+            init();
+        }
+
+        @JniMethod(flags={CONSTANT_INITIALIZER})
+        private static final native void init();
+
+        @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct timespec)", conditional="#ifdef
HAVE_AIO_H")
+        public static int SIZEOF;
         
         @JniField(cast="time_t")
         long tv_sec;  

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=881399&r1=881398&r2=881399&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 17:36:33 2009
@@ -45,8 +45,6 @@
     @JniField(flags={CONSTANT})
     public static int O_RDWR;
     @JniField(flags={CONSTANT})
-    public static int O_NONBLOCK;
-    @JniField(flags={CONSTANT})
     public static int O_APPEND;
     @JniField(flags={CONSTANT})
     public static int O_CREAT;
@@ -54,7 +52,9 @@
     public static int O_TRUNC;
     @JniField(flags={CONSTANT})
     public static int O_EXCL;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef O_NONBLOCK")
+    public static int O_NONBLOCK;
+    @JniField(flags={CONSTANT}, conditional="#ifdef O_ASYNC")
     public static int O_ASYNC;
     
     @JniField(flags={CONSTANT}, conditional="#ifdef O_SHLOCK")
@@ -69,56 +69,56 @@
     public static int O_EVTONLY;
     
     // Mode Constants
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXU")
     public static int S_IRWXU;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IRUSR")
     public static int S_IRUSR;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IWUSR")
     public static int S_IWUSR;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IXUSR")
     public static int S_IXUSR;            
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXG")
     public static int S_IRWXG;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IRGRP")
     public static int S_IRGRP;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IWGRP")
     public static int S_IWGRP;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IXGRP")
     public static int S_IXGRP;            
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXO")
     public static int S_IRWXO;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IROTH")
     public static int S_IROTH;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IWOTH")
     public static int S_IWOTH;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_IXOTH")
     public static int S_IXOTH;            
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_ISUID")
     public static int S_ISUID;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_ISGID")
     public static int S_ISGID;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef S_ISVTX")
     public static int S_ISVTX;
     
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_DUPFD")
     public static int F_DUPFD;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_GETFD")
     public static int F_GETFD;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_SETFD")
     public static int F_SETFD;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_GETFL")
     public static int F_GETFL;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_SETFL")
     public static int F_SETFL;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_GETOWN")
     public static int F_GETOWN;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_SETOWN")
     public static int F_SETOWN;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_GETLK")
     public static int F_GETLK;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_SETLK")
     public static int F_SETLK;
-    @JniField(flags={CONSTANT})
+    @JniField(flags={CONSTANT}, conditional="#ifdef F_SETLKW")
     public static int F_SETLKW;
 
     @JniField(flags={CONSTANT}, conditional="#ifdef F_GETPATH")



Mime
View raw message