diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-08-01 03:52:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 03:52:46 +0200 |
| commit | 3fa2404a793ab72816cbae3a9fedaf5c27c08e00 (patch) | |
| tree | 18314fb6bacad847a4a67845cf050e4d7b06b41c | |
| parent | ccce161d0e8b03cb7abc3186e920547d6914ef56 (diff) | |
| parent | 24b4694313211d5ddf65c21bdb209d2365149ee8 (diff) | |
Merge pull request #20644 from NickToony/master
Fixed Windows mono compile
| -rw-r--r-- | modules/mono/utils/thread_local.cpp | 4 | ||||
| -rw-r--r-- | modules/mono/utils/thread_local.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/mono/utils/thread_local.cpp b/modules/mono/utils/thread_local.cpp index 248f24c855..ae9f130518 100644 --- a/modules/mono/utils/thread_local.cpp +++ b/modules/mono/utils/thread_local.cpp @@ -69,7 +69,7 @@ struct ThreadLocalStorage::Impl { #define _CALLBACK_FUNC_ #endif - Impl(void _CALLBACK_FUNC_ (*p_destr_callback_func)(void *)) { + Impl(void (_CALLBACK_FUNC_ *p_destr_callback_func)(void *)) { #ifdef WINDOWS_ENABLED dwFlsIndex = FlsAlloc(p_destr_callback_func); 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); } -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)); } diff --git a/modules/mono/utils/thread_local.h b/modules/mono/utils/thread_local.h index d0c5df3c91..783e40dc01 100644 --- a/modules/mono/utils/thread_local.h +++ b/modules/mono/utils/thread_local.h @@ -76,7 +76,7 @@ struct ThreadLocalStorage { void *get_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(); private: |