[armedbear-cvs] r12176 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Oct  5 16:19:12 2009
New Revision: 12176

Log:
Add OpenJDK identification of Darwin to the
*FEATURES* setup and the OS type detection.

Found by: John Pallister < john  synchromesh com >

Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/Utilities.java

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Mon Oct  5 16:19:12 2009
@@ -2318,7 +2318,8 @@
                                              Keyword.SUNOS,
                                              Keyword.CDR6));
       }
-    else if (osName.startsWith("Mac OS X"))
+    else if (osName.startsWith("Mac OS X") ||
+             osName.startsWith("Darwin"))
       {
         Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
                                              Keyword.ABCL,

Modified: trunk/abcl/src/org/armedbear/lisp/Utilities.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Utilities.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Utilities.java	Mon Oct  5 16:19:12 2009
@@ -50,7 +50,8 @@
     static {
         String osName = System.getProperty("os.name");
         isPlatformUnix = osName.startsWith("Linux") ||
-            osName.startsWith("Mac OS X") || osName.startsWith("Solaris") ||
+            osName.startsWith("Mac OS X") || osName.startsWith("Darwin") ||
+            osName.startsWith("Solaris") ||
             osName.startsWith("SunOS") || osName.startsWith("AIX") ||
             osName.startsWith("FreeBSD") || osName.startsWith("OpenBSD") ||
             osName.startsWith("NetBSD");