Cleanup firebird-sdbc header defines.

Previously directly taken from skeleton driver, some possible conflicts.

Change-Id: I9469ed8a3bb78a18b68fce3c8a9272eeb38349ba

8 files changed, 23 insertions, 23 deletions

diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/FConnection.hxx
index 5acaf51aa9e8..b746c743c301 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SCONNECTION_HXX
-#define CONNECTIVITY_SCONNECTION_HXX
+#ifndef CONNECTIVITY_FIREBIRD_CONNECTION_HXX
+#define CONNECTIVITY_FIREBIRD_CONNECTION_HXX
 
 #include "Blob.hxx"
 
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx
index 414dcacdba73..1a12ed16bc11 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
-#define CONNECTIVITY_SDATABASEMETADATA_HXX
+#ifndef CONNECTIVITY_FIREBIRD_DATABASEMETADATA_HXX
+#define CONNECTIVITY_FIREBIRD_DATABASEMETADATA_HXX
 
 #include "FConnection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -215,6 +215,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
+#endif // CONNECTIVITY_FIREBIRD_DATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FDriver.hxx b/connectivity/source/drivers/firebird/FDriver.hxx
index 307ecddcaf61..e5752e28470a 100644
--- a/connectivity/source/drivers/firebird/FDriver.hxx
+++ b/connectivity/source/drivers/firebird/FDriver.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SDRIVER_HXX
-#define CONNECTIVITY_SDRIVER_HXX
+#ifndef CONNECTIVITY_FIREBIRD_DRIVER_HXX
+#define CONNECTIVITY_FIREBIRD_DRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -84,6 +84,6 @@ namespace connectivity
 
 }
 
-#endif // CONNECTIVITY_SDRIVER_HXX
+#endif // CONNECTIVITY_FIREBIRD_DRIVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.hxx b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
index b6976a6383f3..da09df1125cc 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
-#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#ifndef CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
+#define CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
 #include "FStatement.hxx"
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
@@ -153,6 +153,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#endif // CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx
index 3b4f734574f0..917f21ddacc0 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/FResultSet.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SRESULTSET_HXX
-#define CONNECTIVITY_SRESULTSET_HXX
+#ifndef CONNECTIVITY_FIREBIRD_RESULTSET_HXX
+#define CONNECTIVITY_FIREBIRD_RESULTSET_HXX
 
 #include "FStatement.hxx"
 
@@ -249,6 +249,6 @@ namespace connectivity
              OResultSet::retrieveValue(sal_Int32 columnIndex);
     }
 }
-#endif // CONNECTIVITY_SRESULTSET_HXX
+#endif // CONNECTIVITY_FIREBIRD_RESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.hxx b/connectivity/source/drivers/firebird/FResultSetMetaData.hxx
index be6bb8ba5be3..da36a16734f0 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/FResultSetMetaData.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
-#define CONNECTIVITY_SRESULSETMETADATA_HXX
+#ifndef CONNECTIVITY_FIREBIRD_RESULTSETMETADATA_HXX
+#define CONNECTIVITY_FIREBIRD_RESULTSETMETADATA_HXX
 
 #include "FConnection.hxx"
 
@@ -118,6 +118,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
+#endif // CONNECTIVITY_FIREBIRD_RESULTSETMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FStatement.hxx b/connectivity/source/drivers/firebird/FStatement.hxx
index 8b12382e2d37..408e671972c2 100644
--- a/connectivity/source/drivers/firebird/FStatement.hxx
+++ b/connectivity/source/drivers/firebird/FStatement.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SSTATEMENT_HXX
-#define CONNECTIVITY_SSTATEMENT_HXX
+#ifndef CONNECTIVITY_FIREBIRD_STATEMENT_HXX
+#define CONNECTIVITY_FIREBIRD_STATEMENT_HXX
 
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
@@ -188,6 +188,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_SSTATEMENT_HXX
+#endif // CONNECTIVITY_FIREBIRD_STATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/FSubComponent.hxx b/connectivity/source/drivers/firebird/FSubComponent.hxx
index 426a33ec7f8f..914804e20fc6 100644
--- a/connectivity/source/drivers/firebird/FSubComponent.hxx
+++ b/connectivity/source/drivers/firebird/FSubComponent.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _CONNECTIVITY_FSUBCOMPONENT_HXX_
-#define _CONNECTIVITY_FSUBCOMPONENT_HXX_
+#ifndef CONNECTIVITY_FIREBIRD_SUBCOMPONENT_HXX
+#define CONNECTIVITY_FIREBIRD_SUBCOMPONENT_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.h>
@@ -158,6 +158,6 @@ namespace connectivity
 
     }
 }
-#endif // _CONNECTIVITY_FSUBCOMPONENT_HXX_
+#endif // CONNECTIVITY_FIREBIRD_SUBCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */