| Index: webrtc/base/gunit.h
|
| diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
|
| index 7431fcf308e63b619aeab4204bd7222db5d0f225..c2bc844d5fa229c8a5c67740ce6456d6ae3b8831 100644
|
| --- a/webrtc/base/gunit.h
|
| +++ b/webrtc/base/gunit.h
|
| @@ -20,22 +20,21 @@
|
| #endif
|
|
|
| // Wait until "ex" is true, or "timeout" expires.
|
| -#define WAIT(ex, timeout) \
|
| - for (uint32 start = rtc::Time(); \
|
| - !(ex) && rtc::Time() < start + timeout;) \
|
| +#define WAIT(ex, timeout) \
|
| + for (uint32_t start = rtc::Time(); !(ex) && rtc::Time() < start + timeout;) \
|
| rtc::Thread::Current()->ProcessMessages(1);
|
|
|
| // This returns the result of the test in res, so that we don't re-evaluate
|
| // the expression in the XXXX_WAIT macros below, since that causes problems
|
| // when the expression is only true the first time you check it.
|
| -#define WAIT_(ex, timeout, res) \
|
| - do { \
|
| - uint32 start = rtc::Time(); \
|
| - res = (ex); \
|
| +#define WAIT_(ex, timeout, res) \
|
| + do { \
|
| + uint32_t start = rtc::Time(); \
|
| + res = (ex); \
|
| while (!res && rtc::Time() < start + timeout) { \
|
| - rtc::Thread::Current()->ProcessMessages(1); \
|
| - res = (ex); \
|
| - } \
|
| + rtc::Thread::Current()->ProcessMessages(1); \
|
| + res = (ex); \
|
| + } \
|
| } while (0);
|
|
|
| // The typical EXPECT_XXXX and ASSERT_XXXXs, but done until true or a timeout.
|
|
|