AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fix for Linux Standard Base

Browse Source 
Change-Id: I1a6dba065c45bf732c0174ed0a6492cc80478985
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Harald Fernengel 2012-03-28 09:50:52 +02:00 committed by Qt by Nokia
parent 2ad8b63762
commit 3df8a12f05
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/thread/qthread_unix.cpp
View File

@ -90,7 +90,7 @@
# endif # endif
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
#include <sys/prctl.h> #include <sys/prctl.h>
#endif #endif
@ -110,7 +110,8 @@ QT_BEGIN_NAMESPACE
enum { ThreadPriorityResetFlag = 0x80000000 }; enum { ThreadPriorityResetFlag = 0x80000000 };
#if defined(Q_OS_LINUX) && defined(__GLIBC__) && (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) #if defined(Q_OS_LINUX) && defined(__GLIBC__) && (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) && !defined(QT_LINUXBASE)
/* LSB doesn't have __thread, https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=993 */
#define HAVE_TLS #define HAVE_TLS
#endif #endif
#if defined(Q_CC_XLC) || defined (Q_CC_SUN) #if defined(Q_CC_XLC) || defined (Q_CC_SUN)
@ -294,7 +295,7 @@ void *QThreadPrivate::start(void *arg)
if (objectName.isEmpty()) if (objectName.isEmpty())
objectName = thr->metaObject()->className(); objectName = thr->metaObject()->className();
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
prctl(PR_SET_NAME, (unsigned long)objectName.constData(), 0, 0, 0); prctl(PR_SET_NAME, (unsigned long)objectName.constData(), 0, 0, 0);
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
pthread_setname_np(objectName.constData()); pthread_setname_np(objectName.constData());