Mercurial > hg > truffle
diff src/os_cpu/linux_x86/vm/os_linux_x86.cpp @ 2211:0cd39a385a72
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Mon, 21 Feb 2011 19:17:33 +0100 |
parents | 06f017f7daa7 d70fe6ab4436 |
children | 0654ee04b214 |
line wrap: on
line diff
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Feb 21 19:17:10 2011 +0100 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Feb 21 19:17:33 2011 +0100 @@ -216,7 +216,7 @@ extern "C" void FetchNResume () ; #endif // AMD64 -extern "C" int +extern "C" JNIEXPORT int JVM_handle_linux_signal(int sig, siginfo_t* info, void* ucVoid,