Resolve unresolved macro _NTO_THREAD_NAME_MAX and undeclared array tName
This commit is contained in:
Alexander B 2024-07-24 11:30:32 +03:00 committed by GitHub
parent 1edabc19d8
commit a6762f51cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -41,6 +41,9 @@
# include <time.h> # include <time.h>
#endif #endif
#if POCO_OS == POCO_OS_QNX
# include <sys/neutrino.h>
#endif
#if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID #if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID
# include <sys/prctl.h> # include <sys/prctl.h>
@ -111,18 +114,23 @@ namespace
std::string getThreadName() std::string getThreadName()
{ {
char name[POCO_MAX_THREAD_NAME_LEN + 1]{'\0'}; constexpr size_t nameSize =
#if (POCO_OS == POCO_OS_QNX)
_NTO_THREAD_NAME_MAX;
#else
POCO_MAX_THREAD_NAME_LEN;
#endif
char name[nameSize + 1]{'\0'};
#if (POCO_OS == POCO_OS_FREE_BSD) #if (POCO_OS == POCO_OS_FREE_BSD)
pthread_getname_np(pthread_self(), name, POCO_MAX_THREAD_NAME_LEN + 1); pthread_getname_np(pthread_self(), name, nameSize + 1);
#elif (POCO_OS == POCO_OS_MAC_OS_X) #elif (POCO_OS == POCO_OS_MAC_OS_X)
#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
pthread_getname_np(pthread_self(), name, POCO_MAX_THREAD_NAME_LEN + 1); pthread_getname_np(pthread_self(), name, nameSize + 1);
#endif #endif
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED #endif // __MAC_OS_X_VERSION_MIN_REQUIRED
#elif (POCO_OS == POCO_OS_QNX) #elif (POCO_OS == POCO_OS_QNX)
tName[_NTO_THREAD_NAME_MAX] = {'\0'}; pthread_getname_np(pthread_self(), name, nameSize);
pthread_getname_np(pthread_self(), tName, _NTO_THREAD_NAME_MAX);
#else #else
prctl(PR_GET_NAME, name); prctl(PR_GET_NAME, name);
#endif #endif