svn commit: r708867 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/OS.java native/os/unix/system.c

[mturk]

Author: mturk
Date: Wed Oct 29 03:39:16 2008
New Revision: 708867

URL: http://svn.apache.org/viewvc?rev=708867&view=rev
Log:
Add MACOSX OS detection

Modified:
    tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/OS.java
    tomcat/connectors/trunk/jni/native/os/unix/system.c

Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/OS.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/OS.java?rev=708867&r1=708866&r2=708867&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/OS.java (original)
+++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/OS.java Wed Oct 29 
03:39:16 2008
@@ -33,6 +33,7 @@
     private static final int LINUX     = 5;
     private static final int SOLARIS   = 6;
     private static final int BSD       = 7;
+    private static final int MACOSX    = 8;
 
     public static final int LOG_EMERG  = 1;
     public static final int LOG_ERROR  = 2;
@@ -54,6 +55,7 @@
     public static final boolean IS_LINUX   = is(LINUX);
     public static final boolean IS_SOLARIS = is(SOLARIS);
     public static final boolean IS_BSD     = is(BSD);
+    public static final boolean IS_MACOSX  = is(MACOSX);
 
     /**
      * Get the name of the system default characer set.

Modified: tomcat/connectors/trunk/jni/native/os/unix/system.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/unix/system.c?rev=708867&r1=708866&r2=708867&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/os/unix/system.c (original)
+++ tomcat/connectors/trunk/jni/native/os/unix/system.c Wed Oct 29 03:39:16 2008
@@ -99,6 +99,10 @@
     else if (type == 7)
         return JNI_TRUE;
 #endif
+#if defined(__APPLE__) || defined(DARWIN)
+    else if (type == 8)
+        return JNI_TRUE;
+#endif
     else
         return JNI_FALSE;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]