Rename DB_ID_MYSQL to DATABASE_MYSQL

7 files changed, 16 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 600707e..cfe641c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = libcommon tracer common
 
-if DB_ID_MYSQL
+if DATABASE_MYSQL
 SUBDIRS += mysql
 endif
 
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 <common/config.h>
 #endif
 
-#if defined(DB_ID_MYSQL)
+#if defined(DATABASE_MYSQL)
 #  include <odb/mysql/database.hxx>
 #  include <odb/mysql/connection-factory.hxx>
 #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<mysql::connection_factory> 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 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -106,7 +106,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -126,7 +126,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -148,7 +148,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(db_id_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
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'                     >>$@
diff --git a/m4/database.m4 b/m4/database.m4
index 8fca493..d49c7d2 100644
--- a/m4/database.m4
+++ b/m4/database.m4
@@ -21,7 +21,7 @@ AC_ARG_WITH(
        ;;
      mysql)
        database=mysql
-       AC_DEFINE([DB_ID_MYSQL], [1], [Using MySQL.])
+       AC_DEFINE([DATABASE_MYSQL], [1], [Using MySQL.])
        ;;
      *)
        AC_MSG_RESULT([])
@@ -36,6 +36,6 @@ AC_ARG_WITH(
 AC_MSG_RESULT([$database])
 AC_SUBST([database])
 
-AM_CONDITIONAL([DB_ID_MYSQL], [test x$database = xmysql])
+AM_CONDITIONAL([DATABASE_MYSQL], [test x$database = xmysql])
 
 ])dnl