Merge pull request #338 from Nekotekina/fix1

Build: Compilation fix (mingw64)

Merge pull request #338 from Nekotekina/fix1
af3674d8 · John Kessenich · GitHub · 630dd7da · 5dd29c8a · af3674d8
Commit af3674d8 authored Jun 13, 2016 by John Kessenich Committed by GitHub Jun 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ossource.cpp glslang/OSDependent/Windows/ossource.cpp +1 -1

No files found.
--- a/glslang/OSDependent/Windows/ossource.cpp
+++ b/glslang/OSDependent/Windows/ossource.cpp
@@ -134,7 +134,7 @@ unsigned int __stdcall EnterGenericThread (void* entry)
 void* OS_CreateThread(TThreadEntrypoint entry)
 {
-    return (void*)_beginthreadex(0, 0, EnterGenericThread, entry, 0, 0);
+    return (void*)_beginthreadex(0, 0, EnterGenericThread, (void*)entry, 0, 0);
 }
 void OS_WaitForAllThreads(void* threads, int numThreads)