zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- Made VMFrameStack GlobalVMStack a non thread_local variable for MinGW since that helps to prevent crashes on exit."

Browse source 
This reverts commit 429bd5d843.
This commit is contained in:
drfrag 2020-01-05 19:55:15 +01:00
parent b78978fa7b
commit 2bf731cfa9
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/vm/vmexec.cpp
View file

@ -149,11 +149,7 @@ VMExec_Checked::Exec
// Note: If the VM is being used in multiple threads, this should be declared as thread_local. // Note: If the VM is being used in multiple threads, this should be declared as thread_local.
// ZDoom doesn't need this at the moment so this is disabled. // ZDoom doesn't need this at the moment so this is disabled.
#ifndef __MINGW32__
thread_local VMFrameStack GlobalVMStack; thread_local VMFrameStack GlobalVMStack;
#else
VMFrameStack GlobalVMStack;
#endif
//=========================================================================== //===========================================================================

4
src/scripting/vm/vmintern.h
View file

@ -437,11 +437,7 @@ void VMFillParams(VMValue *params, VMFrame *callee, int numparam);
void VMDumpConstants(FILE *out, const VMScriptFunction *func); void VMDumpConstants(FILE *out, const VMScriptFunction *func);
void VMDisasm(FILE *out, const VMOP *code, int codesize, const VMScriptFunction *func); void VMDisasm(FILE *out, const VMOP *code, int codesize, const VMScriptFunction *func);
#ifndef __MINGW32__
extern thread_local VMFrameStack GlobalVMStack; extern thread_local VMFrameStack GlobalVMStack;
#else
extern VMFrameStack GlobalVMStack;
#endif
typedef std::pair<const class PType *, unsigned> FTypeAndOffset; typedef std::pair<const class PType *, unsigned> FTypeAndOffset;