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/global | |
| 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/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index db5f6f3bb1..77f6c48857 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -136,7 +136,6 @@ #elif defined(__GNUC__) # define Q_CC_GNU (__GNUC__ * 100 + __GNUC_MINOR__) -# define Q_C_CALLBACKS # if defined(__MINGW32__) # define Q_CC_MINGW # endif @@ -312,7 +311,6 @@ /* The Comeau compiler is based on EDG and does define __EDG__ */ # if defined(__COMO__) # define Q_CC_COMEAU -# define Q_C_CALLBACKS /* The `using' keyword was introduced to avoid KAI C++ warnings but it's now causing KAI C++ errors instead. The standard is @@ -396,7 +394,6 @@ # if !defined(_BOOL) # error "Compiler not supported" # endif -# define Q_C_CALLBACKS /* 4.2 compiler or older */ # else # error "Compiler not supported" |