From 1aca664d67e931c48f43de7ff53915ab0a20bfb6 Mon Sep 17 00:00:00 2001 From: "joshuawarner32@gmail.com" Date: Sat, 2 May 2015 16:34:36 -0600 Subject: [PATCH 1/2] remove unused AVIAN_PROCESS preprocessor define --- makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/makefile b/makefile index 726f04a233..558276fee9 100755 --- a/makefile +++ b/makefile @@ -1295,7 +1295,6 @@ ifeq ($(process),compile) vm-asm-sources += $(src)/compile-$(arch).$(asm-format) endif -cflags += -DAVIAN_PROCESS_$(process) ifeq ($(aot-only),true) cflags += -DAVIAN_AOT_ONLY endif From 1f6e7be3b0ef7358219060120f3dd763e713e9bc Mon Sep 17 00:00:00 2001 From: "joshuawarner32@gmail.com" Date: Sun, 3 May 2015 13:20:33 -0600 Subject: [PATCH 2/2] fix openjdk build after finder size_t change I'm not sure how we didn't catch this when merging #425, but there you are. --- src/classpath-openjdk.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp index 8814018370..10a3f89204 100644 --- a/src/classpath-openjdk.cpp +++ b/src/classpath-openjdk.cpp @@ -993,7 +993,7 @@ int64_t JNICALL return Exists | Directory; } - unsigned length; + size_t length; System::FileType type = finder->stat(ef.path, &length, true); switch (type) { case System::TypeUnknown: @@ -1052,7 +1052,7 @@ int64_t JNICALL return mask == Read; } - unsigned length; + size_t length; System::FileType type = finder->stat(ef.path, &length, true); switch (type) { case System::TypeDoesNotExist: @@ -1106,7 +1106,7 @@ int64_t JNICALL getFileLength(Thread* t, GcMethod* method, uintptr_t* arguments) return 0; } - unsigned fileLength; + size_t fileLength; finder->stat(ef.path, &fileLength); return fileLength; }