Merge branch 'develop' into 'develop'

Fix non msvc build broken by 5758af77

See merge request !43
This commit is contained in:
Daniel Kochmański 2017-01-11 07:33:51 +00:00
commit 625f76b752

View file

@ -365,7 +365,12 @@ ecl_import_current_thread(cl_object name, cl_object bindings)
cl_object p = processes->vector.self.t[i]; cl_object p = processes->vector.self.t[i];
if (!Null(p) if (!Null(p)
&& &&
GetThreadId(p->process.thread) == GetThreadId(current)) #ifdef ECL_WINDOWS_THREADS
GetThreadId(p->process.thread) == GetThreadId(current)
#else
p->process.thread == current
#endif
)
return 0; return 0;
} }
} }