From cd02eb5b2090a8e263642ce900de9160e60f7d0f Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Fri, 15 Jun 2018 12:11:11 +0200
Subject: ibase: Silence warning about incompatible function types

This correctly silents the warning about incompatible function types,
it amends the previous fix - 6108d8f515d7911427b764647f1d6ab487ad5203

Task-number: QTBUG-68330
Change-Id: I9eda42817740f491b16ac19c553f35fb1c7aa755
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
---
 src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/plugins/sqldrivers')

diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 484dad6e1d..ead08dbce8 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -1845,9 +1845,11 @@ bool QIBaseDriver::subscribeToNotification(const QString &name)
                    eBuffer->bufferLength,
                    eBuffer->eventBuffer,
 #if defined (FB_API_VER) && FB_API_VER >= 20
-                   reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback),
+                   reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *>
+                                                                     (&qEventCallback)),
 #else
-                   reinterpret_cast<isc_callback>(qEventCallback),
+                   reinterpret_cast<isc_callback>(reinterpret_cast<void *>
+                                                        (&qEventCallback)),
 #endif
                    eBuffer->resultBuffer);
 
@@ -1925,9 +1927,11 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer)
                            eBuffer->bufferLength,
                            eBuffer->eventBuffer,
 #if defined (FB_API_VER) && FB_API_VER >= 20
-                                    reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback),
+                           reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *>
+                                                                (&qEventCallback)),
 #else
-                                    reinterpret_cast<isc_callback>(qEventCallback),
+                           reinterpret_cast<isc_callback>(reinterpret_cast<void *>
+                                                          (&qEventCallback)),
 #endif
                                    eBuffer->resultBuffer);
             if (Q_UNLIKELY(status[0] == 1 && status[1])) {
-- 
cgit v1.2.3