Merge "Fix a clang/win build error"

vp8/common/threading.h

diff --git a/vp8/common/threading.h b/vp8/common/threading.h
index bc99dbb..a433d03 100644
--- a/vp8/common/threading.h
+++ b/vp8/common/threading.h
@@ -24,7 +24,7 @@
 /* Win32 */
 #include <process.h>
 #include <windows.h>
-#define THREAD_FUNCTION DWORD WINAPI
+#define THREAD_FUNCTION unsigned int __stdcall
 #define THREAD_FUNCTION_RETURN DWORD
 #define THREAD_SPECIFIC_INDEX DWORD
 #define pthread_t HANDLE