Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
| author | never |
|---|---|
| date | Sun, 25 Sep 2011 16:03:29 -0700 |
| parents | e6b1331a51d2 |
| children | 436b4a3231bf |
comparison
equal
deleted
inserted
replaced
| 3959:eda6988c0d81 | 3960:f08d439fab8c |
|---|---|
| 80 #endif | 80 #endif |
| 81 #ifdef TARGET_OS_FAMILY_windows | 81 #ifdef TARGET_OS_FAMILY_windows |
| 82 # include "os_windows.inline.hpp" | 82 # include "os_windows.inline.hpp" |
| 83 # include "thread_windows.inline.hpp" | 83 # include "thread_windows.inline.hpp" |
| 84 #endif | 84 #endif |
| 85 #ifdef TARGET_OS_FAMILY_bsd | |
| 86 # include "os_bsd.inline.hpp" | |
| 87 # include "thread_bsd.inline.hpp" | |
| 88 #endif | |
| 85 | 89 |
| 86 static jint CurrentVersion = JNI_VERSION_1_6; | 90 static jint CurrentVersion = JNI_VERSION_1_6; |
| 87 | 91 |
| 88 | 92 |
| 89 // The DT_RETURN_MARK macros create a scoped object to fire the dtrace | 93 // The DT_RETURN_MARK macros create a scoped object to fire the dtrace |