Backport changes for Windows compiling

diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile
index 001a37fd30dbcea2f94aa48c93709f9f4edde6bc..1beac1afa06a9a4a672e63e5c06f82b22b419808 100644 (file)
--- a/bacula/src/win32/cats/Makefile
+++ b/bacula/src/win32/cats/Makefile
@@ -31,6 +31,7 @@ SQL_OBJS = \
        sql_delete.o \
        sql_find.o \
        sql_get.o \
+       sql_glue.o \
        sql_list.o \
        sql_update.o \
        bvfs.o

diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def
index d2e676600da9899e9d502e2ab626b8ad1f778e45..150298e19b95edef642b503eb2afa60214cee0bc 100644 (file)
--- a/bacula/src/win32/cats/bacula_cats.def
+++ b/bacula/src/win32/cats/bacula_cats.def
@@ -38,7 +38,6 @@ _Z20db_start_transactionP3JCRP4B_DB
 _Z23db_open_batch_connexionP3JCRP4B_DB
 _Z24db_check_max_connectionsP3JCRP4B_DBj
 _Z28db_check_backend_thread_safev
-_Z7db_initP3JCRPKcS2_S2_S2_S2_iS2_i
 _Z7QueryDBPKciP3JCRP4B_DBPc
 _Z8DeleteDBPKciP3JCRP4B_DBPc
 _Z8InsertDBPKciP3JCRP4B_DBPc
@@ -130,14 +129,12 @@ _Z28db_add_digest_to_file_recordP3JCRP4B_DByPci
  
 _Z11db_get_typev
 _Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_
-_Z13db_next_indexP3JCRP4B_DBPcS3_
 _Z16db_escape_stringP3JCRP4B_DBPcS3_i
 _Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i
 _Z16db_open_databaseP3JCRP4B_DB
 _Z17db_close_databaseP3JCRP4B_DB
 _Z17db_thread_cleanupv
 
-db_type DATA
 client_backups DATA
 list_pool DATA
 drop_deltabs DATA

diff --git a/bacula/src/win32/compat/winconfig.h b/bacula/src/win32/compat/winconfig.h
index 9433159add39d58bd2d0784fcb267b81f0067a17..be02604bf1c35c7045680e6e995521cba3ee4332 100644 (file)
--- a/bacula/src/win32/compat/winconfig.h
+++ b/bacula/src/win32/compat/winconfig.h
@@ -41,8 +41,8 @@
 /* Define if you want to use embedded MySQL */
 /* #undef HAVE_EMBEDDED_MYSQL */
 
-/* Define if you want to use SQLite */
-/* #undef HAVE_SQLITE */
+/* Define if you want to use SQLite3 */
+/* #undef HAVE_SQLITE3 */
 
 /* Define if you want to use Berkeley DB */
 /* #undef HAVE_BERKELEY_DB */
@@ -51,34 +51,6 @@
 /* Define if you want to use PostgreSQL */
 /* #undef HAVE_PGSQL */
 
-/* Define if you want to use mSQL */
-/* #undef HAVE_MSQL */
-
-/* Define if you want to use iODBC */
-/* #undef HAVE_IODBC */
-
-/* Define if you want to use unixODBC */
-/* #undef HAVE_UNIXODBC */
-
-/* Define if you want to use Solid SQL Server */
-/* #undef HAVE_SOLID */
-
-/* Define if you want to use OpenLink ODBC (Virtuoso) */
-/* #undef HAVE_VIRT */
-
-/* Define if you want to use EasySoft ODBC */
-/* #undef HAVE_EASYSOFT */
-
-/* Define if you want to use Interbase SQL Server */
-/* #undef HAVE_IBASE */
-
-/* Define if you want to use Oracle 8 SQL Server */
-/* #undef HAVE_ORACLE8 */
-
-/* Define if you want to use Oracle 7 SQL Server */
-/* #undef HAVE_ORACLE7 */
-
-
 /* ------------------------------------------------------------------------- */
 /* --                     CONFIGURE DETECTED FEATURES                     -- */
 /* ------------------------------------------------------------------------- */
@@ -134,10 +106,6 @@
 #define HAVE_UTIME_H 1
 #endif
 
-#if (HAVE_MYSQL||HAVE_PGSQL||HAVE_MSQL||HAVE_IODBC||HAVE_UNIXODBC||HAVE_SOLID||HAVE_VIRT||HAVE_IBASE||HAVE_ORACLE8||HAVE_ORACLE7||HAVE_EASYSOFT)
-#define HAVE_SQL
-#endif
-
 /* Data types */
 #define HAVE_U_INT 1
 #define HAVE_INTXX_T 1

diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def
index 97dd7497467b6a64b1a441817707a55dad739438..1d6f1220f08f2ec100994b0adaa2c903a683cfd5 100644 (file)
--- a/bacula/src/win32/lib/bacula32.def
+++ b/bacula/src/win32/lib/bacula32.def
@@ -571,8 +571,6 @@ _ZN8POOL_MEM8max_sizeEv
  
 ; message.o
 _Z10my_name_isiPPcPKc
-_Z11get_db_typev
-_Z11set_db_typePKc
 _Z12add_msg_destP4MSGSiiPcS1_
 _Z12rem_msg_destP4MSGSiiPc
 _Z13free_msgs_resP4MSGS

diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def
index a55f76b774292fbf36596a4131d2427a6aec2483..70cab5aa5051e476704f260ad8ebdaa6d2a81e66 100644 (file)
--- a/bacula/src/win32/lib/bacula64.def
+++ b/bacula/src/win32/lib/bacula64.def
@@ -564,8 +564,6 @@ _ZN8POOL_MEM8max_sizeEv
  
 ; message.o
 _Z10my_name_isiPPcPKc
-_Z11get_db_typev
-_Z11set_db_typePKc
 _Z12add_msg_destP4MSGSiiPcS1_
 _Z12rem_msg_destP4MSGSiiPc
 _Z13free_msgs_resP4MSGS

diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def
index 8bb1fb34de83cbeff2febfecd11bd0eb84bb8f09..86830d1dfd88270600b4511b85cec59137d03316 100644 (file)
--- a/bacula/src/win32/libbac/msvc/bacula.def
+++ b/bacula/src/win32/libbac/msvc/bacula.def
@@ -359,8 +359,6 @@ fnmatch
  \r
 ; message.obj \r
 ?my_name_is@@YAXHQAPADPBD@Z\r
-?get_db_type@@YAPBDXZ\r
-?set_db_type@@YAXPBD@Z\r
 ?init_msg@@YAXPAVJCR@@PAVMSGS@@@Z\r
 ?init_console_msg@@YAXPBD@Z\r
 ?add_msg_dest@@YAXPAVMSGS@@HHPAD1@Z\r