Fix firebird installation (windows) + driver compilation fixes.

Change-Id: I253a2770c951a984bd50c906b0e84feeb8d105d9

5 files changed, 6 insertions, 6 deletions

diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx
index 0f9b20b1325e..5efd16562a18 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -90,7 +90,7 @@ void SAL_CALL OConnection::release() throw()
 /*    Print the status, the SQLCODE, and exit.
  *    Also, indicate which operation the error occured on.
  */
-static int pr_error (long* status, char* operation)
+static int pr_error(const ISC_STATUS* status, char* operation)
 {
     SAL_WARN("connectivity.firebird", "=> OConnection static pr_error().");
 
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
index fe8b432fdf93..3a285c212159 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
@@ -63,7 +63,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS
  *    Print the status, the SQLCODE, and exit.
  *    Also, indicate which operation the error occured on.
  */
-static int pr_error (long* status, char* operation)
+static int pr_error (const ISC_STATUS* status, char* operation)
 {
     SAL_WARN("connectivity.firebird", "=> OPreparedStatement static pr_error().");
 
diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/FResultSet.cxx
index e64019e9da4a..66ac517cb458 100644
--- a/connectivity/source/drivers/firebird/FResultSet.cxx
+++ b/connectivity/source/drivers/firebird/FResultSet.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::util;
  *    Print the status, the SQLCODE, and exit.
  *    Also, indicate which operation the error occured on.
  */
-static int pr_error (long* status, char* operation)
+static int pr_error (const ISC_STATUS* status, char* operation)
 {
     SAL_WARN("connectivity.firebird", "=> OResultSet static pr_error().");
 
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx
index 7dbc4c664e19..e1e6fd95cc0b 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/FResultSet.hxx
@@ -114,9 +114,9 @@ namespace connectivity
                                     sal_Int32 nHandle
                                          ) const;
 
-            virtual void checkColumnIndex( sal_Int32 index )
+            virtual void SAL_CALL checkColumnIndex( sal_Int32 index )
                 throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException );
-            virtual void checkRowIndex( sal_Bool mustBeOnValidRow );
+            virtual void SAL_CALL checkRowIndex( sal_Bool mustBeOnValidRow );
 
             // you can't delete objects of this type
             virtual ~OResultSet();
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/FStatement.cxx
index a966d9918c96..4b162758f95f 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/FStatement.cxx
@@ -64,7 +64,7 @@ using namespace com::sun::star::util;
  *    Print the status, the SQLCODE, and exit.
  *    Also, indicate which operation the error occured on.
  */
-static int pr_error (long* status, char* operation)
+static int pr_error (const ISC_STATUS* status, char* operation)
 {
     printf("[\n");
     printf("PROBLEM ON \"%s\".\n", operation);