aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-04-27 15:07:53 +0200
committerSverker Eriksson <[email protected]>2017-04-27 17:08:38 +0200
commit38cdf3a9e4afaae77633a2b010758d42b9855bc0 (patch)
tree1009620777c1a8be8b4cc19ca5a63fc9e22eabcd /erts
parentd91ceb27ee802711d6333fecb74142ebe74c05cf (diff)
downloadotp-38cdf3a9e4afaae77633a2b010758d42b9855bc0.tar.gz
otp-38cdf3a9e4afaae77633a2b010758d42b9855bc0.tar.bz2
otp-38cdf3a9e4afaae77633a2b010758d42b9855bc0.zip
erts: Fix debug emulator on windows
Clear ethr_not_inited__ early (like on unix) to not get assertion in ethr_tsd_key_create("stacklimit")
Diffstat (limited to 'erts')
-rw-r--r--erts/lib_src/win/ethread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/lib_src/win/ethread.c b/erts/lib_src/win/ethread.c
index ba77b3dc88..98fcd2d451 100644
--- a/erts/lib_src/win/ethread.c
+++ b/erts/lib_src/win/ethread.c
@@ -203,6 +203,8 @@ ethr_init(ethr_init_data *id)
if (!ethr_not_inited__)
return EINVAL;
+ ethr_not_inited__ = 0;
+
#ifdef _WIN32_WINNT
os_version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&os_version);
@@ -238,8 +240,6 @@ ethr_init(ethr_init_data *id)
if (erts_get_cpu_configured(ethr_cpu_info__) == 1)
child_wait_spin_count = 0;
- ethr_not_inited__ = 0;
-
return 0;
error: