Merge branch 'master' of dice:git/vm

This commit is contained in:
Joel Dice
2008-01-25 16:25:37 -07:00
3 changed files with 10 additions and 5 deletions

View File

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