author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 02 Dec 2013 12:29:49 -0500 | |
changeset 158333 | 46680cc56bcfb94d2b89d143c29992dc79eaf12a |
parent 158332 | 90fb9ca640e43eb3983c5bb99083d95bfd764637 |
child 158334 | 66be4716e86e33ebc37d324313b622d9193498a5 |
push id | 25741 |
push user | ryanvm@gmail.com |
push date | Mon, 02 Dec 2013 21:39:06 +0000 |
treeherder | mozilla-central@492fbc8095b8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | BenWa |
bugs | 944844 |
milestone | 28.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/tools/profiler/GeckoProfilerImpl.h +++ b/tools/profiler/GeckoProfilerImpl.h @@ -301,18 +301,18 @@ public: char buff[SAMPLER_MAX_STRING]; // We have to use seperate printf's because we're using // the vargs. #if _MSC_VER _vsnprintf(buff, SAMPLER_MAX_STRING, aFormat, args); _snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aDefault, buff); #else - vsnprintf(buff, SAMPLER_MAX_STRING, aFormat, args); - snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aDefault, buff); + ::vsnprintf(buff, SAMPLER_MAX_STRING, aFormat, args); + ::snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aDefault, buff); #endif mHandle = mozilla_sampler_call_enter(mDest, this, true, line); va_end(args); } else { mHandle = mozilla_sampler_call_enter(aDefault, nullptr, false, line); } } ~SamplerStackFramePrintfRAII() {