Browse Source

Merge pull request #20644 from NickToony/master

Fixed Windows mono compile
Ignacio Etcheverry 7 years ago
parent
commit
3fa2404a79
2 changed files with 3 additions and 3 deletions
  1. 2 2
      modules/mono/utils/thread_local.cpp
  2. 1 1
      modules/mono/utils/thread_local.h

+ 2 - 2
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));
 }
 

+ 1 - 1
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: