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

Unified Diff: runtime/vm/os_thread_win.cc

Issue 1393393004: Rename OnThreadExit to OnDartThreadExit to fix Dartium windows build (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/os_thread_win.cc
diff --git a/runtime/vm/os_thread_win.cc b/runtime/vm/os_thread_win.cc
index f30fcb3ae41b5c0dedb9ff30657ccbb483d279ee..bcb5a5398138c38b67cd9f76942c2d0d9d2d755f 100644
--- a/runtime/vm/os_thread_win.cc
+++ b/runtime/vm/os_thread_win.cc
@@ -518,7 +518,7 @@ extern void ThreadCleanupOnExit();
#endif // _WIN64
// Static callback function to call with each thread termination.
-void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved) {
+void NTAPI OnDartThreadExit(PVOID module, DWORD reason, PVOID reserved) {
// On XP SP0 & SP1, the DLL_PROCESS_ATTACH is never seen. It is sent on SP2+
// and on W2K and W2K3. So don't assume it is sent.
if (DLL_THREAD_DETACH == reason || DLL_PROCESS_DETACH == reason) {
@@ -543,7 +543,8 @@ void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved) {
extern "C" {
// The linker must not discard p_thread_callback_dart. (We force a reference
// to this variable with a linker /INCLUDE:symbol pragma to ensure that.) If
-// this variable is discarded, the OnThreadExit function will never be called.
+// this variable is discarded, the OnDartThreadExit function will never be
+// called.
#ifdef _WIN64
// .CRT section is merged with .rdata on x64 so it must be constant data.
@@ -551,7 +552,7 @@ extern "C" {
// When defining a const variable, it must have external linkage to be sure the
// linker doesn't discard it.
extern const PIMAGE_TLS_CALLBACK p_thread_callback_dart;
-const PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnThreadExit;
+const PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnDartThreadExit;
// Reset the default section.
#pragma const_seg()
@@ -559,7 +560,7 @@ const PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnThreadExit;
#else // _WIN64
#pragma data_seg(".CRT$XLB")
-PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnThreadExit;
+PIMAGE_TLS_CALLBACK p_thread_callback_dart = OnDartThreadExit;
// Reset the default section.
#pragma data_seg()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698