| Index: webrtc/base/thread.h
|
| diff --git a/webrtc/base/thread.h b/webrtc/base/thread.h
|
| index 97e69415cd3dba6098c022edfd7968a705c7c357..be400f9e29bb6786a59f089885d55aaa9cc2e434 100644
|
| --- a/webrtc/base/thread.h
|
| +++ b/webrtc/base/thread.h
|
| @@ -28,6 +28,12 @@
|
| #include "webrtc/base/win32.h"
|
| #endif
|
|
|
| +#if defined(WEBRTC_WIN)
|
| +# define THREAD_CALLING_CONV __stdcall
|
| +#else // WEBRTC_WIN
|
| +# define THREAD_CALLING_CONV
|
| +#endif // WEBRTC_WIN
|
| +
|
| namespace rtc {
|
|
|
| class Thread;
|
| @@ -238,7 +244,7 @@ class LOCKABLE Thread : public MessageQueue {
|
| friend class ScopedDisallowBlockingCalls;
|
|
|
| private:
|
| - static void *PreRun(void *pv);
|
| + static void* THREAD_CALLING_CONV PreRun(void *pv);
|
|
|
| // ThreadManager calls this instead WrapCurrent() because
|
| // ThreadManager::Instance() cannot be used while ThreadManager is
|
|
|