diff --git a/.prude_pthread b/.prude_pthread new file mode 100755 index 0000000..38f40db --- /dev/null +++ b/.prude_pthread @@ -0,0 +1,115 @@ ++PTHREAD_MUTEX_INITIALIZER + +# Thread Management APIs ++pthread_attr_destroy ++pthread_attr_getdetachstate ++pthread_attr_getinheritsched ++pthread_attr_getschedparam ++pthread_attr_init ++pthread_attr_setdetachstate ++pthread_attr_setinheritsched ++pthread_attr_setschedparam ++pthread_clear_exit_np ++pthread_create ++pthread_delay_np ++pthread_detach ++pthread_equal ++pthread_exit ++pthread_extendedjoin_np ++pthread_getconcurrency ++pthread_getpthreadoption_np ++pthread_getschedparam ++pthread_getthreadid_np ++pthread_getunique_np +Thread ++pthread_is_multithreaded_np ++pthread_join ++pthread_join_np ++pthread_once ++pthread_self ++pthread_setconcurrency ++pthread_setpthreadoption_np ++pthread_setschedparam ++sched_yield +# Thread Specific Storage APIs ++pthread_getspecific ++pthread_key_create ++pthread_key_delete ++pthread_setspecific +# Thread Cancelation APIs ++pthread_cancel ++pthread_cleanup_peek_np ++pthread_cleanup_pop ++pthread_cleanup_push ++pthread_getcancelstate_np ++pthread_setcancelstate ++pthread_setcanceltype ++pthread_testcancel ++pthread_test_exit_np +# Mutex Synchronization APIs ++pthread_mutexattr_destroy ++pthread_mutexattr_getkind_np ++pthread_mutexattr_getname_np ++pthread_mutexattr_getpshared ++pthread_mutexattr_gettype ++pthread_mutexattr_init ++pthread_mutexattr_setkind_np ++pthread_mutexattr_setname_np ++pthread_mutexattr_setpshared ++pthread_mutexattr_settype ++pthread_set_mutexattr_default_np ++pthread_mutex_destroy ++pthread_mutex_init ++pthread_mutex_lock ++pthread_mutex_timedlock_np ++pthread_mutex_trylock ++pthread_mutex_unlock ++pthread_lock_global_np ++pthread_unlock_global_np +# Condition Variable Synchronization APIs ++pthread_condattr_destroy ++pthread_condattr_getpshared ++pthread_condattr_init ++pthread_condattr_setpshared ++pthread_cond_broadcast ++pthread_cond_destroy ++pthread_cond_init ++pthread_cond_signal ++pthread_cond_timedwait ++pthread_cond_wait ++pthread_get_expiration_np +# Read/Write Lock Synchronization APIs ++pthread_rwlockattr_destroy ++pthread_rwlockattr_getpshared ++pthread_rwlockattr_init ++pthread_rwlockattr_setpshared ++pthread_rwlock_destroy ++pthread_rwlock_init ++pthread_rwlock_rdlock ++pthread_rwlock_timedrdlock_np ++pthread_rwlock_timedwrlock_np ++pthread_rwlock_tryrdlock ++pthread_rwlock_trywrlock ++pthread_rwlock_unlock ++pthread_rwlock_wrlock +# Signals APIs ++pthread_kill ++pthread_sigmask ++pthread_signal_to_cancel_np +# Unsupported APIs ++pthread_atfork ++pthread_atfork_np ++pthread_attr_getschedpolicy ++pthread_attr_getscope ++pthread_attr_getstackaddr ++pthread_attr_getstacksize ++pthread_attr_setschedpolicy ++pthread_attr_setscope ++pthread_attr_setstackaddr ++pthread_attr_setstacksize ++pthread_mutexattr_getprioceiling ++pthread_mutexattr_getprotocol ++pthread_mutexattr_setprioceiling ++pthread_mutexattr_setprotocol ++pthread_mutex_getprioceiling ++pthread_mutex_setprioceiling diff --git a/etk/RegEx.hpp b/etk/RegEx.hpp index a92e191..e0d6eb6 100644 --- a/etk/RegEx.hpp +++ b/etk/RegEx.hpp @@ -2005,6 +2005,8 @@ template class RegEx { if (m_isOk == false) { return false; } + m_areaFind.start=0; + m_areaFind.stop=0; TK_REG_DEBUG("Request parse : " << _startPos << " --> " << _endPos); int64_t bufferLength = _SearchIn.size(); if (_endPos > bufferLength) { @@ -2096,6 +2098,8 @@ template class RegEx { if (m_isOk == false) { return false; } + m_areaFind.start=0; + m_areaFind.stop=0; int64_t bufferLength = _SearchIn.size(); if (_endPos > bufferLength) { _endPos = bufferLength; diff --git a/etk/math/Vector3D.cpp b/etk/math/Vector3D.cpp index b32ff70..9d8a3b3 100644 --- a/etk/math/Vector3D.cpp +++ b/etk/math/Vector3D.cpp @@ -9,8 +9,12 @@ #include #include +#ifdef ETK_BUILD_LINEARMATH + ETK_DECLARE_TYPE(btVector3); +#else + ETK_DECLARE_TYPE(etk::Vector3D); +#endif ETK_DECLARE_TYPE(etk::Vector3D); -ETK_DECLARE_TYPE(etk::Vector3D); ETK_DECLARE_TYPE(etk::Vector3D); ETK_DECLARE_TYPE(etk::Vector3D); diff --git a/etk/types.hpp b/etk/types.hpp index cc85aba..cdf49e1 100644 --- a/etk/types.hpp +++ b/etk/types.hpp @@ -16,8 +16,10 @@ extern "C" { #include #include } -#ifndef size_t - using size_t=uint64_t; +#if !defined(__TARGET_OS__MacOs) + #ifndef size_t + using size_t=uint64_t; + #endif #endif #ifndef INT8_MIN #define INT8_MIN (-128) diff --git a/lutin_etk-base.py b/lutin_etk-base.py index c0491c6..f7338ab 100644 --- a/lutin_etk-base.py +++ b/lutin_etk-base.py @@ -71,7 +71,8 @@ def configure(target, my_module): if "Android" in target.get_type(): my_module.add_depend("SDK") - + if "MacOs" in target.get_type(): + my_module.add_depend("cxx") my_module.add_path(".") return True