mysqlc/Library_mysqlc.mk | 6 +++--- mysqlc/source/mysqlc_databasemetadata.cxx | 4 ++-- mysqlc/source/mysqlc_driver.cxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit d335638ea6a5ac4e3e276bfd9d704dc320bbd211 Author: Rene Engelhard <[email protected]> Date: Sun Mar 10 14:32:09 2013 +0100 oops Change-Id: I05efc60a6108a899db006df3a8c43bdec9c5850a diff --git a/mysqlc/Module_mysqlc.mk.rej b/mysqlc/Module_mysqlc.mk.rej deleted file mode 100644 index 5a930f3..0000000 --- a/mysqlc/Module_mysqlc.mk.rej +++ /dev/null @@ -1,11 +0,0 @@ ---- mysqlc/Module_mysqlc.mk -+++ mysqlc/Module_mysqlc.mk -@@ -9,7 +9,7 @@ - - $(eval $(call gb_Module_Module,mysqlc)) - --ifeq ($(ENABLE_MYSQLC),YES) -+ifeq ($(ENABLE_MARIADBC),YES) - - $(eval $(call gb_Module_add_targets,mysqlc,\ - Configuration_mysql \ commit 7011fc2c1ddf2a0780d6441b4c5830be2aabc64c Author: Rene Engelhard <[email protected]> Date: Sun Mar 10 14:31:13 2013 +0100 more s/MYSQLC/MARIADBC/ to make mysqlc actually build... Change-Id: I286c2100c33371d5ed1ac0be3ae6393dabe6c4ef diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 635838e..ad8bc8d 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -39,9 +39,9 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\ $(eval $(call gb_Library_add_defs,mysqlc,\ -DCPPDBC_EXPORTS \ -DCPPCON_LIB_BUILD \ - -DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \ - -DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \ - -DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \ + -DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \ + -DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \ + -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \ $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ )) diff --git a/mysqlc/Module_mysqlc.mk.rej b/mysqlc/Module_mysqlc.mk.rej new file mode 100644 index 0000000..5a930f3 --- /dev/null +++ b/mysqlc/Module_mysqlc.mk.rej @@ -0,0 +1,11 @@ +--- mysqlc/Module_mysqlc.mk ++++ mysqlc/Module_mysqlc.mk +@@ -9,7 +9,7 @@ + + $(eval $(call gb_Module_Module,mysqlc)) + +-ifeq ($(ENABLE_MYSQLC),YES) ++ifeq ($(ENABLE_MARIADBC),YES) + + $(eval $(call gb_Module_add_targets,mysqlc,\ + Configuration_mysql \ diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index e134e05..898c158 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1176,7 +1176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion() throw(RuntimeException) { OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion"); - return MYSQLC_VERSION_MAJOR; + return MARIADBC_VERSION_MAJOR; } /* }}} */ @@ -1210,7 +1210,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion() throw(RuntimeException) { OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion"); - return MYSQLC_VERSION_MINOR; + return MARIADBC_VERSION_MINOR; } /* }}} */ diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 029fe0f..b399da8 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -277,7 +277,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion() throw(RuntimeException) { OSL_TRACE("MysqlCDriver::getMajorVersion"); - return MYSQLC_VERSION_MAJOR; + return MARIADBC_VERSION_MAJOR; } /* }}} */ @@ -287,7 +287,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion() throw(RuntimeException) { OSL_TRACE("MysqlCDriver::getMinorVersion"); - return MYSQLC_VERSION_MINOR; + return MARIADBC_VERSION_MINOR; } /* }}} */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
