ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-05 18:49:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of dice:git/vm

Browse Source
This commit is contained in:
Joel Dice 2008-01-25 16:25:37 -07:00
commit 4ea8b0a1fe
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classpath/java/util/Properties.java
View File

@ -111,6 +111,13 @@ public class Properties extends Hashtable {
finishLine(map); finishLine(map);
} }
break; break;
case 'n':
if (escaped) {
append('\n');
} else {
append(c);
}
break;
default: default:
append(c); append(c);

2
makefile
View File

@ -298,7 +298,7 @@ $(binaryToMacho): $(src)/binaryToMacho.cpp
$(classpath-object): $(build)/classpath.jar $(binaryToMacho) $(classpath-object): $(build)/classpath.jar $(binaryToMacho)
ifeq ($(platform),darwin) ifeq ($(platform),darwin)
$(binaryToMacho) $(build)/classpath.jar \ $(binaryToMacho) $(build)/classpath.jar \
__binary_classpath_jar_data __binary_classpath_jar_size > $(@) __binary_classpath_jar_start __binary_classpath_jar_size > $(@)
else else
(wd=$$(pwd); \ (wd=$$(pwd); \
cd $(build); \ cd $(build); \

6
src/main.cpp
View File

@ -19,11 +19,10 @@ void operator delete(void*) { abort(); }
# define SYMBOL(x) _binary_classpath_jar_##x # define SYMBOL(x) _binary_classpath_jar_##x
#endif #endif
extern "C" {
#ifndef __APPLE__
#define BOOT_CLASSPATH "[classpathJar]" #define BOOT_CLASSPATH "[classpathJar]"
extern "C" {
extern const uint8_t SYMBOL(start)[]; extern const uint8_t SYMBOL(start)[];
extern const uint8_t SYMBOL(size)[]; extern const uint8_t SYMBOL(size)[];
@ -33,7 +32,6 @@ extern "C" {
*size = reinterpret_cast<uintptr_t>(SYMBOL(size)); *size = reinterpret_cast<uintptr_t>(SYMBOL(size));
return SYMBOL(start); return SYMBOL(start);
} }
#endif
} }