ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/origin/B14038_Lion_appshare' into oss-master

Browse Source
This commit is contained in:
Joel Dice 2011-06-03 14:39:50 -06:00
commit bcc72e8c9d
9 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classpath/java-io.cpp
View File

@ -15,7 +15,11 @@
#include <string.h>
#include <stdlib.h>
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
#ifdef PLATFORM_WINDOWS

6
classpath/java-lang.cpp
View File

@ -13,7 +13,11 @@
#include "time.h"
#include "string.h"
#include "stdio.h"
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
#include "errno.h"
#include "fcntl.h"

6
classpath/java-net.cpp
View File

@ -8,7 +8,11 @@
There is NO WARRANTY for this software. See license.txt for
details. */
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
#ifdef PLATFORM_WINDOWS

6
classpath/java-nio.cpp
View File

@ -13,7 +13,11 @@
#include <string.h>
#include <stdlib.h>
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
#ifdef PLATFORM_WINDOWS

6
classpath/java-util-zip.cpp
View File

@ -12,7 +12,11 @@
#include "string.h"
#include "zlib-custom.h"
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
extern "C" JNIEXPORT jlong JNICALL

6
classpath/java-util.cpp
View File

@ -9,7 +9,11 @@
details. */
#include "time.h"
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "jni-util.h"
namespace {

18
makefile
View File

@ -246,7 +246,7 @@ ifeq ($(platform),darwin)
ar = i686-apple-darwin8-ar
ranlib = i686-apple-darwin8-ranlib
strip = i686-apple-darwin8-strip
sysroot = /opt/mac/SDKs/MacOSX10.4u.sdk
sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
else
@ -269,20 +269,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=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
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}
endif
ifeq ($(arch),i386)
ifeq ($(build-arch),powerpc)
converter-cflags += -DOPPOSITE_ENDIAN
endif
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
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}
endif
ifeq ($(arch),x86_64)

6
src/main.cpp
View File

@ -11,7 +11,11 @@
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
#include "jni.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h"
#endif
#include "system.h"
#include "finder.h"

8
src/powerpc.cpp
View File

@ -2439,16 +2439,16 @@ class MyAssembler: public Assembler {
return arch_;
}
virtual void checkStackOverflow(uintptr_t handler,
unsigned stackLimitOffsetFromThread)
virtual void checkStackOverflow(uintptr_t /*handler*/,
unsigned /*stackLimitOffsetFromThread*/)
{
Register stack(StackRegister);
/*Register stack(StackRegister);
Memory stackLimit(ThreadRegister, stackLimitOffsetFromThread);
Constant handlerConstant
(new (c.zone->allocate(sizeof(ResolvedPromise)))
ResolvedPromise(handler));
branchRM(&c, JumpIfGreaterOrEqual, BytesPerWord, &stack, &stackLimit,
&handlerConstant);
&handlerConstant);*/
}
virtual void saveFrame(unsigned stackOffset, unsigned) {