change to cdecl

erikzhang · May 19, 2016 · 594f971 · 594f971
1 parent a211cd6
commit 594f971
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/leveldb.vcxproj b/leveldb.vcxproj
@@ -92,7 +92,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +106,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +120,6 @@
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -139,7 +136,6 @@
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/util/env_windows.cc b/util/env_windows.cc
@@ -463,8 +463,24 @@ void PosixEnv::BGThread() {
   }
 }
 
+struct StartThreadContext {
+	void(*function)(void* arg);
+	void* arg;
+};
+
+DWORD WINAPI StartThreadCallback(LPVOID lpThreadParameter) {
+	StartThreadContext* context = (StartThreadContext*)lpThreadParameter;
+	void(*function)(void* arg) = context->function;
+	void* arg = context->arg;
+	delete context;
+	function(arg);
+}
+
 void PosixEnv::StartThread(void(*function)(void* arg), void* arg) {
-  CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)function, arg, 0, NULL);
+	StartThreadContext* context = new StartThreadContext;
+	context->function = function;
+	context->arg = arg;
+	CreateThread(NULL, 0, StartThreadCallback, context, 0, NULL);
 }
 
 }