diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-15 22:15:29 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-17 06:31:20 +0100 |
| commit | 9d46189a64769d44842accfe427ebf5cdbc9d73b (patch) | |
| tree | 47e09e6cac6dc4a7432941a1cf7e2ab3a7265e8b /src/corelib/thread | |
| parent | 2f010390adba67996de687dd8d3bc427fb2305bf (diff) | |
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 <lars.knoll@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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 |