comparison src/share/vm/runtime/timer.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 f95d63e2154a
children 9646b7ff4d14
comparison
equal deleted inserted replaced
3959:eda6988c0d81 3960:f08d439fab8c
32 #ifdef TARGET_OS_FAMILY_solaris 32 #ifdef TARGET_OS_FAMILY_solaris
33 # include "os_solaris.inline.hpp" 33 # include "os_solaris.inline.hpp"
34 #endif 34 #endif
35 #ifdef TARGET_OS_FAMILY_windows 35 #ifdef TARGET_OS_FAMILY_windows
36 # include "os_windows.inline.hpp" 36 # include "os_windows.inline.hpp"
37 #endif
38 #ifdef TARGET_OS_FAMILY_bsd
39 # include "os_bsd.inline.hpp"
37 #endif 40 #endif
38 41
39 42
40 void elapsedTimer::add(elapsedTimer t) { 43 void elapsedTimer::add(elapsedTimer t) {
41 _counter += t._counter; 44 _counter += t._counter;