summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2008-02-23 14:46:43 +0000
committerKenneth Russel <[email protected]>2008-02-23 14:46:43 +0000
commitcb0b5d8b93e7ca266707f2256ca4d4a555938ecd (patch)
tree8a141a9cd019d7daeaebf2d7f7e67b15ae0d159a /src
parent7181447bb3043f326f1f6b018f5f41478146ba1d (diff)
Changes for 64-bit Mac OS X from dhale; unclear why things worked earlier
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@72 a78bb65f-1512-4460-ba86-f6dc96a7bf27
Diffstat (limited to 'src')
-rw-r--r--src/java/com/sun/gluegen/StructLayout.java1
-rwxr-xr-xsrc/java/com/sun/gluegen/runtime/CPU.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/java/com/sun/gluegen/StructLayout.java b/src/java/com/sun/gluegen/StructLayout.java
index fb7ff4d..7045f89 100644
--- a/src/java/com/sun/gluegen/StructLayout.java
+++ b/src/java/com/sun/gluegen/StructLayout.java
@@ -138,6 +138,7 @@ public class StructLayout {
(os.startsWith("sunos") && cpu.equals("amd64")) ||
(os.startsWith("mac os") && cpu.equals("ppc")) ||
(os.startsWith("mac os") && cpu.equals("i386")) ||
+ (os.startsWith("mac os") && cpu.equals("x86_64")) ||
(os.startsWith("freebsd") && cpu.equals("i386")) ||
(os.startsWith("hp-ux") && cpu.equals("pa_risc2.0"))
) {
diff --git a/src/java/com/sun/gluegen/runtime/CPU.java b/src/java/com/sun/gluegen/runtime/CPU.java
index 74106fc..efb015d 100755
--- a/src/java/com/sun/gluegen/runtime/CPU.java
+++ b/src/java/com/sun/gluegen/runtime/CPU.java
@@ -67,6 +67,7 @@ public class CPU {
(os.startsWith("linux") && cpu.equals("amd64")) ||
(os.startsWith("linux") && cpu.equals("x86_64")) ||
(os.startsWith("linux") && cpu.equals("ia64")) ||
+ (os.startsWith("mac os") && cpu.equals("x86_64")) ||
(os.startsWith("sunos") && cpu.equals("sparcv9")) ||
(os.startsWith("sunos") && cpu.equals("amd64"))) {
} else {