From d5fcf4c978ee0a8c4c6cc926ff02ab9d944f12b8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 14 Sep 2010 15:17:37 +0200 Subject: Rename DB_ID_MYSQL to DATABASE_MYSQL --- libcommon/common/common.cxx | 6 +++--- libcommon/common/config.h.in | 2 +- libcommon/common/libcommon-vc10.vcxproj | 8 ++++---- libcommon/common/libcommon-vc9.vcproj | 8 ++++---- libcommon/common/makefile | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'libcommon/common') diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx index 730b8ce..a2a2e64 100644 --- a/libcommon/common/common.cxx +++ b/libcommon/common/common.cxx @@ -10,7 +10,7 @@ # include #endif -#if defined(DB_ID_MYSQL) +#if defined(DATABASE_MYSQL) # include # include #else @@ -30,14 +30,14 @@ create_database (int& argc, char* argv[], size_t max_connections) cerr << "Usage: " << argv[0] << " [options]" << endl << "Options:" << endl; -#if defined(DB_ID_MYSQL) +#if defined(DATABASE_MYSQL) mysql::database::print_usage (cerr); #endif exit (0); } -#if defined(DB_ID_MYSQL) +#if defined(DATABASE_MYSQL) auto_ptr f; if (max_connections != 0) diff --git a/libcommon/common/config.h.in b/libcommon/common/config.h.in index 06318c4..d0b2bd9 100644 --- a/libcommon/common/config.h.in +++ b/libcommon/common/config.h.in @@ -9,7 +9,7 @@ #ifndef LIBCOMMON_COMMON_CONFIG_H #define LIBCOMMON_COMMON_CONFIG_H -#undef DB_ID_MYSQL +#undef DATABASE_MYSQL #undef LIBCOMMON_STATIC_LIB #endif /* LIBCOMMON_COMMON_CONFIG_H */ diff --git a/libcommon/common/libcommon-vc10.vcxproj b/libcommon/common/libcommon-vc10.vcxproj index 74d704b..44034da 100644 --- a/libcommon/common/libcommon-vc10.vcxproj +++ b/libcommon/common/libcommon-vc10.vcxproj @@ -88,7 +88,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) .. 4355;4800;4290;4251;%(DisableSpecificWarnings) @@ -106,7 +106,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) .. 4355;4800;4290;4251;%(DisableSpecificWarnings) @@ -126,7 +126,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) .. 4355;4800;4290;4251;%(DisableSpecificWarnings) @@ -148,7 +148,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions) .. 4355;4800;4290;4251;%(DisableSpecificWarnings) diff --git a/libcommon/common/libcommon-vc9.vcproj b/libcommon/common/libcommon-vc9.vcproj index fd7c323..c7ef766 100644 --- a/libcommon/common/libcommon-vc9.vcproj +++ b/libcommon/common/libcommon-vc9.vcproj @@ -46,7 +46,7 @@ AdditionalOptions="/wd4355 /wd4800 /wd4290" Optimization="0" AdditionalIncludeDirectories=".." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -124,7 +124,7 @@ AdditionalOptions="/wd4355 /wd4800 /wd4290" Optimization="0" AdditionalIncludeDirectories=".." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));__upcase__(db_id_)__upcase__(__value__(database));__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -203,7 +203,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -284,7 +284,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/libcommon/common/makefile b/libcommon/common/makefile index 41bb776..fccce1a 100644 --- a/libcommon/common/makefile +++ b/libcommon/common/makefile @@ -49,7 +49,7 @@ $(out_base)/config.h: $(dcf_root)/configuration-dynamic.make @echo '#define LIBCOMMON_COMMON_CONFIG_H' >>$@ @echo '' >>$@ ifeq ($(db_id),mysql) - @echo '#define DB_ID_MYSQL 1' >>$@ + @echo '#define DATABASE_MYSQL 1' >>$@ endif @echo '' >>$@ @echo '#endif // LIBCOMMON_COMMON_CONFIG_H' >>$@ -- cgit v1.1