Mercurial > hg > truffle
comparison src/share/vm/utilities/debug.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 | 2e038ad0c1d0 |
| children | 436b4a3231bf |
comparison
equal
deleted
inserted
replaced
| 3959:eda6988c0d81 | 3960:f08d439fab8c |
|---|---|
| 59 # include "thread_solaris.inline.hpp" | 59 # include "thread_solaris.inline.hpp" |
| 60 #endif | 60 #endif |
| 61 #ifdef TARGET_OS_FAMILY_windows | 61 #ifdef TARGET_OS_FAMILY_windows |
| 62 # include "os_windows.inline.hpp" | 62 # include "os_windows.inline.hpp" |
| 63 # include "thread_windows.inline.hpp" | 63 # include "thread_windows.inline.hpp" |
| 64 #endif | |
| 65 #ifdef TARGET_OS_FAMILY_bsd | |
| 66 # include "os_bsd.inline.hpp" | |
| 67 # include "thread_bsd.inline.hpp" | |
| 64 #endif | 68 #endif |
| 65 | 69 |
| 66 #ifndef ASSERT | 70 #ifndef ASSERT |
| 67 # ifdef _DEBUG | 71 # ifdef _DEBUG |
| 68 // NOTE: don't turn the lines below into a comment -- if you're getting | 72 // NOTE: don't turn the lines below into a comment -- if you're getting |