ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-10 19:31:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #432 from joshuawarner32/master

Browse Source 
Fix openjdk-src build after #425
This commit is contained in:
Joel Dice 2015-05-04 07:45:47 -06:00
commit a24a1f9b90
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefile
View File

@ -1295,7 +1295,6 @@ ifeq ($(process),compile)
vm-asm-sources += $(src)/compile-$(arch).$(asm-format) vm-asm-sources += $(src)/compile-$(arch).$(asm-format)
endif endif
cflags += -DAVIAN_PROCESS_$(process)
ifeq ($(aot-only),true) ifeq ($(aot-only),true)
cflags += -DAVIAN_AOT_ONLY cflags += -DAVIAN_AOT_ONLY
endif endif

6
src/classpath-openjdk.cpp
View File

@ -993,7 +993,7 @@ int64_t JNICALL
return Exists | Directory; return Exists | Directory;
} }
unsigned length; size_t length;
System::FileType type = finder->stat(ef.path, &length, true); System::FileType type = finder->stat(ef.path, &length, true);
switch (type) { switch (type) {
case System::TypeUnknown: case System::TypeUnknown:
@ -1052,7 +1052,7 @@ int64_t JNICALL
return mask == Read; return mask == Read;
} }
unsigned length; size_t length;
System::FileType type = finder->stat(ef.path, &length, true); System::FileType type = finder->stat(ef.path, &length, true);
switch (type) { switch (type) {
case System::TypeDoesNotExist: case System::TypeDoesNotExist:
@ -1106,7 +1106,7 @@ int64_t JNICALL getFileLength(Thread* t, GcMethod* method, uintptr_t* arguments)
return 0; return 0;
} }
unsigned fileLength; size_t fileLength;
finder->stat(ef.path, &fileLength); finder->stat(ef.path, &fileLength);
return fileLength; return fileLength;
} }