From: Kern Sibbald Date: Sun, 30 Aug 2009 22:16:03 +0000 (+0200) Subject: Fix Win32/64 build X-Git-Tag: Release-5.0.0~325^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d9b09e77b1db2f23c4504b8fa73107079b8b6dd5;p=bacula%2Fbacula Fix Win32/64 build --- diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h index 24301083f3..08623a7a92 100644 --- a/bacula/src/baconfig.h +++ b/bacula/src/baconfig.h @@ -411,6 +411,7 @@ typedef int (INTHANDLER)(); #if defined(HAVE_WIN32) typedef int64_t boffset_t; +#define caddr_t char * #else typedef off_t boffset_t; #endif diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile index ee5ef67e87..001a37fd30 100644 --- a/bacula/src/win32/cats/Makefile +++ b/bacula/src/win32/cats/Makefile @@ -33,6 +33,7 @@ SQL_OBJS = \ sql_get.o \ sql_list.o \ sql_update.o \ + bvfs.o LIBS_DLL = \ $(LIBS_BACULA) diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def index 44d3321588..7c82051e6e 100644 --- a/bacula/src/win32/cats/bacula_cats.def +++ b/bacula/src/win32/cats/bacula_cats.def @@ -1,5 +1,26 @@ LIBRARY bacula_cats.dll EXPORTS + +; bvfs.o +_Z15bvfs_parent_dirPc +_Z17bvfs_basename_dirPc +_Z17bvfs_update_cacheP3JCRP4B_DB +_Z32bvfs_update_path_hierarchy_cacheP3JCRP4B_DBP11db_list_ctx +_ZN4Bvfs12_handle_pathEPviPPc +_ZN4Bvfs12update_cacheEv +_ZN4Bvfs15ls_special_dirsEv +_ZN4Bvfs18get_dir_filenameidEv +_ZN4Bvfs21get_all_file_versionsEjjPKc +_ZN4Bvfs6ch_dirEPKc +_ZN4Bvfs7ls_dirsEv +_ZN4Bvfs8get_rootEv +_ZN4Bvfs8ls_filesEv +_ZN4BvfsC1EP3JCRP4B_DB +_ZN4BvfsC2EP3JCRP4B_DB +_ZN4BvfsD0Ev +_ZN4BvfsD1Ev +_ZN4BvfsD2Ev + ; sql.o _Z10_db_unlockPKciP4B_DB @@ -7,6 +28,7 @@ _Z11db_strerrorP4B_DB _Z11list_dashesP4B_DBPFvPvPKcES1_ _Z11list_resultP3JCRP4B_DBPFvPvPKcES3_11e_list_type _Z16db_int64_handlerPviPPc +_Z15db_list_handlerPviPPc _Z18db_end_transactionP3JCRP4B_DB _Z18get_sql_record_maxP3JCRP4B_DB _Z19split_path_and_fileP3JCRP4B_DBPKc @@ -57,14 +79,13 @@ _Z16db_get_file_listP3JCRP4B_DBPcPFiPviPS3_ES4_ _Z16db_get_media_idsP3JCRP4B_DBP9MEDIA_DBRPiPPj _Z17db_get_client_idsP3JCRP4B_DBPiPPj _Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR -_Z18db_get_int_handlerPviPPc _Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR _Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list _Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR _Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR _Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR _Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR -_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRPc +_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRP11db_list_ctx _Z23db_get_job_volume_namesP3JCRP4B_DBjPPc _Z23db_get_num_pool_recordsP3JCRP4B_DB _Z24db_get_num_media_recordsP3JCRP4B_DB diff --git a/bacula/src/win32/cats/make_def b/bacula/src/win32/cats/make_def index 945f86a9b6..a37bffdc9a 100755 --- a/bacula/src/win32/cats/make_def +++ b/bacula/src/win32/cats/make_def @@ -10,10 +10,12 @@ echo "LIBRARY bacula_cats.dll" echo "EXPORTS" echo " " -NM=../../../../../cross-tools/mingw32/mingw32/bin/nm +TOPDIR=`(cd ../../..;pwd)` +TOPDIR=${DEPKGS:-${TOPDIR}} +NM=${TOPDIR}/cross-tools/mingw32/mingw32/bin/nm OBJS="sql.o sql_create.o sql_delete.o sql_find.o sql_get.o \ - sql_list.o sql_update.o" + sql_list.o sql_update.o bvfs.o" # # The data could be automated too @@ -63,7 +65,7 @@ DATA="\ uar_sel_jobid_temp" -cd cats_mysql +cd obj32/cats_mysql for i in ${OBJS}; do \ echo "; $i"; \ ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13-; \ diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def index 4187cf6563..8583d399a4 100644 --- a/bacula/src/win32/lib/bacula32.def +++ b/bacula/src/win32/lib/bacula32.def @@ -509,12 +509,9 @@ _Z20get_jcr_by_full_namePc _Z20write_last_jobs_listiy _Z21unlock_last_jobs_listv _Z23get_jcr_by_partial_namePc +_Z24get_next_jobid_from_listPPcPj _Z7new_jcriPFvP3JCRE _Z9lock_jobsv -_ZN3JCR11set_JobTypeEi -_ZN3JCR12set_JobLevelEi -_ZN3JCR11set_JobTypeEi -_ZN3JCR12set_JobLevelEi _ZN3JCR14get_ActionNameEb _ZN3JCR17get_OperationNameEv _ZN3JCR8JobReadsEv diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def index f69e5f8e68..59ae8e7235 100644 --- a/bacula/src/win32/lib/bacula64.def +++ b/bacula/src/win32/lib/bacula64.def @@ -502,12 +502,9 @@ _Z20get_jcr_by_full_namePc _Z20write_last_jobs_listiy _Z21unlock_last_jobs_listv _Z23get_jcr_by_partial_namePc +_Z24get_next_jobid_from_listPPcPj _Z7new_jcriPFvP3JCRE _Z9lock_jobsv -_ZN3JCR11set_JobTypeEi -_ZN3JCR12set_JobLevelEi -_ZN3JCR11set_JobTypeEi -_ZN3JCR12set_JobLevelEi _ZN3JCR14get_ActionNameEb _ZN3JCR17get_OperationNameEv _ZN3JCR8JobReadsEv diff --git a/bacula/src/win32/lib/make_def b/bacula/src/win32/lib/make_def index d2517291f3..89d21cbcd2 100755 --- a/bacula/src/win32/lib/make_def +++ b/bacula/src/win32/lib/make_def @@ -6,12 +6,15 @@ # Kern Sibbald, June 2007 # -NM=../../../../cross-tools/mingw32/mingw32/bin/nm +TOPDIR=`(cd ../../..;pwd)` +TOPDIR=${DEPKGS:-${TOPDIR}} +NM=${TOPDIR}/cross-tools/mingw32/mingw32/bin/nm echo "LIBRARY bacula.dll" echo "EXPORTS" echo " " +cd obj32 for i in *.o ; do \ echo "; $i"; \ ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13- ; \ diff --git a/bacula/technotes b/bacula/technotes index 9a932f09b0..b9fb0f7cbe 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -3,6 +3,7 @@ General: 30Aug09 +kes Fix Win32/64 build kes Fix bug #1355 Director crashes with double free in Accurate SQL query ebl Prohibe copy and assignment in Bvfs. 28Aug09