Backed out changeset 0f5799df920b (bug 1093934) for various test failures CLOSED TREE

This commit is contained in:
Wes Kocher
2015-04-02 13:42:34 -07:00
parent 0018d4938d
commit b4465e0af8
31 changed files with 31 additions and 639 deletions

View File

@@ -23,7 +23,7 @@
#include "mozilla/ReentrantMonitor.h"
#include "mozilla/Mutex.h"
#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZILLA_INTERNAL_API
#include "GeckoProfiler.h"
#endif //MOZILLA_INTERNAL_API
@@ -461,7 +461,7 @@ ReentrantMonitor::Wait(PRIntervalTime aInterval)
mChainPrev = 0;
nsresult rv;
#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZILLA_INTERNAL_API
{
GeckoProfilerSleepRAII profiler_sleep;
#endif //MOZILLA_INTERNAL_API
@@ -470,7 +470,7 @@ ReentrantMonitor::Wait(PRIntervalTime aInterval)
rv = PR_Wait(mReentrantMonitor, aInterval) == PR_SUCCESS ? NS_OK :
NS_ERROR_FAILURE;
#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZILLA_INTERNAL_API
}
#endif //MOZILLA_INTERNAL_API