Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: webrtc/base/thread.h

Issue 2667863003: crash with ASAN and libjingle in WebRTC thread (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/base/thread.cc » ('j') | webrtc/base/thread.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | webrtc/base/thread.cc » ('j') | webrtc/base/thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698