Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #401 from PhenomRetroShare/Fix_WindowsCompilationWithThreadName

Browse Source 
Fix Compilation with unknown pthread_getname_np if not __USE_GNU defined
This commit is contained in:
Cyril Soler 2016-06-02 20:36:51 -04:00
commit 5362fd3413
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libretroshare/src/util/rsthreads.cc
View File

@ -164,18 +164,20 @@ void RsThread::start(const std::string &threadName)
mTid = tid; mTid = tid;
// set name // set name
if(!threadName.empty()) { #ifdef __USE_GNU
// thread names are restricted to 16 characters including the terminating null byte if(!threadName.empty()) {
if(threadName.length() > 15) // thread names are restricted to 16 characters including the terminating null byte
{ if(threadName.length() > 15)
{
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << "RsThread::start called with to long name '" << name << "' truncating..." << std::endl; THREAD_DEBUG << "RsThread::start called with to long name '" << name << "' truncating..." << std::endl;
#endif
pthread_setname_np(mTid, threadName.substr(0, 15).c_str());
} else {
pthread_setname_np(mTid, threadName.c_str());
}
}
#endif #endif
pthread_setname_np(mTid, threadName.substr(0, 15).c_str());
} else {
pthread_setname_np(mTid, threadName.c_str());
}
}
} }
else else
{ {