From c7c0a45a613f8bec5ce4d80114079ee8902452ba Mon Sep 17 00:00:00 2001
From: Matt Klich <matt.klich@readytalk.com>
Date: Wed, 1 Jun 2011 13:56:03 -0600
Subject: [PATCH] Revert "OSX Lion build changes"

This commit introduced conditional includes which is not the preferred
method. Will do it in the makefile instead.

This reverts commit 7148556979793c56e69dabf7e31813930a0e979a.
---
 classpath/java-io.cpp       |  6 +-----
 classpath/java-lang.cpp     |  6 +-----
 classpath/java-net.cpp      |  6 +-----
 classpath/java-nio.cpp      |  6 +-----
 classpath/java-util-zip.cpp |  6 +-----
 classpath/java-util.cpp     |  6 +-----
 makefile                    | 18 +++++++++---------
 src/main.cpp                |  6 +-----
 8 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/classpath/java-io.cpp b/classpath/java-io.cpp
index 6aec10dfc7..abc7684634 100644
--- a/classpath/java-io.cpp
+++ b/classpath/java-io.cpp
@@ -15,11 +15,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 
 #ifdef PLATFORM_WINDOWS
diff --git a/classpath/java-lang.cpp b/classpath/java-lang.cpp
index c74f348f44..5c023242cd 100644
--- a/classpath/java-lang.cpp
+++ b/classpath/java-lang.cpp
@@ -13,11 +13,7 @@
 #include "time.h"
 #include "string.h"
 #include "stdio.h"
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 #include "errno.h"
 #include "fcntl.h"
diff --git a/classpath/java-net.cpp b/classpath/java-net.cpp
index e3a462ea76..20d853adc2 100644
--- a/classpath/java-net.cpp
+++ b/classpath/java-net.cpp
@@ -8,11 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 
 #ifdef PLATFORM_WINDOWS
diff --git a/classpath/java-nio.cpp b/classpath/java-nio.cpp
index 723204b6e7..9a7656db91 100644
--- a/classpath/java-nio.cpp
+++ b/classpath/java-nio.cpp
@@ -13,11 +13,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 
 #ifdef PLATFORM_WINDOWS
diff --git a/classpath/java-util-zip.cpp b/classpath/java-util-zip.cpp
index 3c95d945f2..a7d969839a 100644
--- a/classpath/java-util-zip.cpp
+++ b/classpath/java-util-zip.cpp
@@ -12,11 +12,7 @@
 #include "string.h"
 #include "zlib-custom.h"
 
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 
 extern "C" JNIEXPORT jlong JNICALL
diff --git a/classpath/java-util.cpp b/classpath/java-util.cpp
index 7ea201858f..b880ff2d95 100644
--- a/classpath/java-util.cpp
+++ b/classpath/java-util.cpp
@@ -9,11 +9,7 @@
    details. */
 
 #include "time.h"
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 #include "jni-util.h"
 
 namespace {
diff --git a/makefile b/makefile
index 9262b4d158..35db15f9f9 100644
--- a/makefile
+++ b/makefile
@@ -234,7 +234,7 @@ ifeq ($(platform),darwin)
 		ar = i686-apple-darwin8-ar
 		ranlib = i686-apple-darwin8-ranlib
 		strip = i686-apple-darwin8-strip
-		sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
+		sysroot = /opt/mac/SDKs/MacOSX10.4u.sdk
 		cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
 			$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
 	else
@@ -257,20 +257,20 @@ ifeq ($(platform),darwin)
 		ifneq (,$(filter i386 x86_64 arm,$(build-arch)))
 			converter-cflags += -DOPPOSITE_ENDIAN
 		endif
-		openjdk-extra-cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
+		openjdk-extra-cflags += -arch ppc -mmacosx-version-min=10.4
+		cflags += -arch ppc -mmacosx-version-min=10.4
+		asmflags += -arch ppc -mmacosx-version-min=10.4
+		lflags += -arch ppc -mmacosx-version-min=10.4
 	endif
 
 	ifeq ($(arch),i386)
 		ifeq ($(build-arch),powerpc)
 			converter-cflags += -DOPPOSITE_ENDIAN
 		endif
-		openjdk-extra-cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
+		openjdk-extra-cflags += -arch i386 -mmacosx-version-min=10.4
+		cflags += -arch i386 -mmacosx-version-min=10.4
+		asmflags += -arch i386 -mmacosx-version-min=10.4
+		lflags += -arch i386 -mmacosx-version-min=10.4
 	endif
 
 	ifeq ($(arch),x86_64)
diff --git a/src/main.cpp b/src/main.cpp
index 005f7e49cc..d04fbe3f34 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,11 +11,7 @@
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
-#ifdef __APPLE__
-#  include <JavaVM/jni.h>
-#else
-#  include "jni.h"
-#endif
+#include "jni.h"
 
 #include "system.h"
 #include "finder.h"