Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-07 07:41:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed: windows mono compile (#20598)

Browse Source 
tidy: formatting.

(cherry picked from commit 24b4694313)
This commit is contained in:
Nick Hope
2018-07-31 21:16:47 +01:00
committed by Rémi Verschelde
parent 771f1fe5c1
commit d3b67bde8a
2 changed files with 3 additions and 3 deletions
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: