From af992863f80b613cf4390899e1934ab3b7ae0a2e Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Tue, 18 Jan 2011 14:46:29 +0100 Subject: [PATCH] Backport changes for Windows compiling --- bacula/src/win32/cats/Makefile | 1 + bacula/src/win32/cats/bacula_cats.def | 3 --- bacula/src/win32/compat/winconfig.h | 36 ++----------------------- bacula/src/win32/lib/bacula32.def | 2 -- bacula/src/win32/lib/bacula64.def | 2 -- bacula/src/win32/libbac/msvc/bacula.def | 2 -- 6 files changed, 3 insertions(+), 43 deletions(-) diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile index 001a37fd30..1beac1afa0 100644 --- 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 d2e676600d..150298e19b 100644 --- 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 9433159add..be02604bf1 100644 --- 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 97dd749746..1d6f1220f0 100644 --- 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 a55f76b774..70cab5aa50 100644 --- 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 8bb1fb34de..86830d1dfd 100644 --- a/bacula/src/win32/libbac/msvc/bacula.def +++ b/bacula/src/win32/libbac/msvc/bacula.def @@ -359,8 +359,6 @@ fnmatch ; message.obj ?my_name_is@@YAXHQAPADPBD@Z -?get_db_type@@YAPBDXZ -?set_db_type@@YAXPBD@Z ?init_msg@@YAXPAVJCR@@PAVMSGS@@@Z ?init_console_msg@@YAXPBD@Z ?add_msg_dest@@YAXPAVMSGS@@HHPAD1@Z -- 2.39.2