mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more s/MYSQLC/MARIADBC/ to make mysqlc actually build...

Browse Source 
Change-Id: I286c2100c33371d5ed1ac0be3ae6393dabe6c4ef
This commit is contained in:
Rene Engelhard
2013-03-10 14:31:13 +01:00
parent ea5909eb57
commit 7011fc2c1d
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysqlc/Library_mysqlc.mk
View File

@@ -39,9 +39,9 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
$(eval $(call gb_Library_add_defs,mysqlc,\ $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \ -DCPPDBC_EXPORTS \
-DCPPCON_LIB_BUILD \ -DCPPCON_LIB_BUILD \
-DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \ -DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
-DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \ -DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
-DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \ -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
$(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\
-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
)) ))

11
mysqlc/Module_mysqlc.mk.rej Normal file
View File

@@ -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 \

4
mysqlc/source/mysqlc_databasemetadata.cxx
View File

@@ -1176,7 +1176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion"); OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion");
return MYSQLC_VERSION_MAJOR; return MARIADBC_VERSION_MAJOR;
} }
/* }}} */ /* }}} */
@@ -1210,7 +1210,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion"); OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion");
return MYSQLC_VERSION_MINOR; return MARIADBC_VERSION_MINOR;
} }
/* }}} */ /* }}} */

4
mysqlc/source/mysqlc_driver.cxx
View File

@@ -277,7 +277,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("MysqlCDriver::getMajorVersion"); OSL_TRACE("MysqlCDriver::getMajorVersion");
return MYSQLC_VERSION_MAJOR; return MARIADBC_VERSION_MAJOR;
} }
/* }}} */ /* }}} */
@@ -287,7 +287,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("MysqlCDriver::getMinorVersion"); OSL_TRACE("MysqlCDriver::getMinorVersion");
return MYSQLC_VERSION_MINOR; return MARIADBC_VERSION_MINOR;
} }
/* }}} */ /* }}} */