From 9d46189a64769d44842accfe427ebf5cdbc9d73b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 15 Jan 2015 22:15:29 -0800 Subject: Remove Q_C_CALLBACKS This is useless. The C++ language does require callbacks passed to C functions to also be extern "C". That's what this macro was doing. But #ifdef'ing for the macro only made the code uglier. Just let the extern "C" be there for all compilers. PS: C++ classes can't be extern "C"... Change-Id: Ic5d393bfd36e48a193fcffff13b9c9b3923443dd Reviewed-by: Lars Knoll Reviewed-by: Marc Mutz --- src/corelib/thread/qthread_unix.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/corelib/thread') diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 9a14503584..09659297d0 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -241,15 +241,9 @@ void QAdoptedThread::init() QThreadPrivate */ -#if defined(Q_C_CALLBACKS) extern "C" { -#endif - typedef void*(*QtThreadCallback)(void*); - -#if defined(Q_C_CALLBACKS) } -#endif #endif // QT_NO_THREAD -- cgit v1.2.3