aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-04-28 14:38:03 +0200
committerSverker Eriksson <[email protected]>2017-04-28 14:38:03 +0200
commit156542f6c8d5c98013fec1eb3c9359fc245f20fc (patch)
tree0b9c881ee16f9add3fd8835584ef2e1d65a1e575 /erts
parent0ddb50ea9cd846610929060e54c1310dcb55039d (diff)
parent38cdf3a9e4afaae77633a2b010758d42b9855bc0 (diff)
downloadotp-156542f6c8d5c98013fec1eb3c9359fc245f20fc.tar.gz
otp-156542f6c8d5c98013fec1eb3c9359fc245f20fc.tar.bz2
otp-156542f6c8d5c98013fec1eb3c9359fc245f20fc.zip
Merge branch 'sverker/fix-debug-vm-windows'
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: