From d371f6fa44ffe112e6cc74da247948c5bb00bec4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 13 Apr 2006 17:36:03 +0000 Subject: * qt/qdbusintegrator.cpp: Work around g++ 3.3 bug. Patch by Stefan Eilers. (r529537) --- ChangeLog | 9 +++++++-- qt/qdbusintegrator.cpp | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0fb670a..84488b1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ -2006-04-13 Thiago Macieira + + * qt/qdbusintegrator.cpp: Work around g++ 3.3 bug. + Patch by Stefan Eilers. (r529537) + +2006-04-13 Thiago Macieira * qt/qdbusinternalfilters.cpp: Don't show the parent's contents (r528208) -2006-04-10 Thiago Macieira * qt/Makefile.am: fix the dependency for qdbusconnection_p.moc. It's included in qdbusintegrator.cpp, diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index a9467c00..4a72d197 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -1221,12 +1221,12 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc) //qDebug("base service: %s", service); } -extern "C" +extern "C"{ static void qDBusResultReceived(DBusPendingCall *pending, void *user_data) { QDBusConnectionPrivate::messageResultReceived(pending, user_data); } - +} void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data) { QDBusPendingCall *call = reinterpret_cast(user_data); -- cgit