asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20644 from NickToony/master

Browse source 
Fixed Windows mono compile
This commit is contained in:
Ignacio Etcheverry 2018-08-01 03:52:46 +02:00 committed by GitHub
commit 3fa2404a79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/utils/thread_local.cpp
View file

@ -69,7 +69,7 @@ struct ThreadLocalStorage::Impl {
#define _CALLBACK_FUNC_ #define _CALLBACK_FUNC_
#endif #endif
Impl(void _CALLBACK_FUNC_ (*p_destr_callback_func)(void *)) { Impl(void (_CALLBACK_FUNC_ *p_destr_callback_func)(void *)) {
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
dwFlsIndex = FlsAlloc(p_destr_callback_func); dwFlsIndex = FlsAlloc(p_destr_callback_func);
ERR_FAIL_COND(dwFlsIndex == FLS_OUT_OF_INDEXES); ERR_FAIL_COND(dwFlsIndex == FLS_OUT_OF_INDEXES);
@ -95,7 +95,7 @@ void ThreadLocalStorage::set_value(void *p_value) const {
pimpl->set_value(p_value); pimpl->set_value(p_value);
} }
void ThreadLocalStorage::alloc(void _CALLBACK_FUNC_ (*p_destr_callback)(void *)) { void ThreadLocalStorage::alloc(void (_CALLBACK_FUNC_ *p_destr_callback)(void *)) {
pimpl = memnew(ThreadLocalStorage::Impl(p_destr_callback)); pimpl = memnew(ThreadLocalStorage::Impl(p_destr_callback));
} }

2
modules/mono/utils/thread_local.h
View file

@ -76,7 +76,7 @@ struct ThreadLocalStorage {
void *get_value() const; void *get_value() const;
void set_value(void *p_value) const; void set_value(void *p_value) const;
void alloc(void _CALLBACK_FUNC_ (*p_dest_callback)(void *)); void alloc(void (_CALLBACK_FUNC_ *p_dest_callback)(void *));
void free(); void free();
private: private: