Commit 459134b8 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

msvcp90: {init,free}_misc() are only used with msvcp >= 100.

parent 39314912
...@@ -1364,6 +1364,7 @@ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) ...@@ -1364,6 +1364,7 @@ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)
return InitOnceExecuteOnce(flag, func, param, NULL); return InitOnceExecuteOnce(flag, func, param, NULL);
} }
#if _MSVCP_VER >= 100
void init_misc(void *base) void init_misc(void *base)
{ {
#ifdef __x86_64__ #ifdef __x86_64__
...@@ -1393,6 +1394,7 @@ void free_misc(void) ...@@ -1393,6 +1394,7 @@ void free_misc(void)
HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast); HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast);
#endif #endif
} }
#endif
#if _MSVCP_VER >= 140 #if _MSVCP_VER >= 140
LONGLONG __cdecl _Query_perf_counter(void) LONGLONG __cdecl _Query_perf_counter(void)
......
...@@ -209,14 +209,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ...@@ -209,14 +209,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
init_exception(hinstDLL); init_exception(hinstDLL);
init_locale(hinstDLL); init_locale(hinstDLL);
init_io(hinstDLL); init_io(hinstDLL);
#if _MSVCP_VER >= 100
init_misc(hinstDLL); init_misc(hinstDLL);
#endif
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (lpvReserved) break; if (lpvReserved) break;
free_io(); free_io();
free_locale(); free_locale();
free_lockit(); free_lockit();
#if _MSVCP_VER >= 100
free_misc(); free_misc();
#endif
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment