From 7c71f2c186518b05292efd4ad3ca25f7dbb31c11 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 9 Jul 2008 15:05:25 +0000 Subject: [PATCH] ebl Update for bat on win32 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7350 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/bcomm/dircomm.cpp | 2 +- bacula/src/qt-console/console/console.cpp | 2 +- bacula/src/qt-console/restore/restoretree.cpp | 2 +- bacula/src/win32/External-mingw32 | 2 +- bacula/src/win32/dll/bacula.def | 4 +++- bacula/technotes-2.5 | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp index ae97f9af33..e96ca6a0d0 100644 --- a/bacula/src/qt-console/bcomm/dircomm.cpp +++ b/bacula/src/qt-console/bcomm/dircomm.cpp @@ -544,7 +544,7 @@ static int tls_pem_callback(char *buf, int size, const void *userdata) #ifdef HAVE_TLS const char *prompt = (const char *)userdata; # if defined(HAVE_WIN32) - sendit(prompt); + //sendit(prompt); if (win32_cgets(buf, size) == NULL) { buf[0] = 0; return 0; diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp index f159083c9e..7defc72e65 100644 --- a/bacula/src/qt-console/console/console.cpp +++ b/bacula/src/qt-console/console/console.cpp @@ -846,7 +846,7 @@ static int tls_pem_callback(char *buf, int size, const void *userdata) #ifdef HAVE_TLS const char *prompt = (const char *)userdata; # if defined(HAVE_WIN32) - sendit(prompt); + //sendit(prompt); if (win32_cgets(buf, size) == NULL) { buf[0] = 0; return 0; diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp index 6aa4b54d03..9171b321c4 100644 --- a/bacula/src/qt-console/restore/restoretree.cpp +++ b/bacula/src/qt-console/restore/restoretree.cpp @@ -486,7 +486,7 @@ void restoreTree::jobComboChanged(int) } job_defaults job_defs; - (void)index; + //(void)index; job_defs.job_name = jobCombo->currentText(); if (m_console->get_job_defaults(job_defs)) { fileSetCombo->setCurrentIndex(fileSetCombo->findText(job_defs.fileset_name, Qt::MatchExactly)); diff --git a/bacula/src/win32/External-mingw32 b/bacula/src/win32/External-mingw32 index b5b37c490c..30ede46fb3 100644 --- a/bacula/src/win32/External-mingw32 +++ b/bacula/src/win32/External-mingw32 @@ -32,7 +32,7 @@ OPENSSL|http://www.bacula.org/depkgs-mingw32/openssl-0.9.8b.tar.gz PCRE|http://www.bacula.org/depkgs-mingw32/pcre-6.3.tar.bz2 POSTGRESQL|http://www.bacula.org/depkgs-mingw32/postgresql-base-8.1.4.tar.bz2|postgresql-8.1.4 PTHREADS|http://www.bacula.org/depkgs-mingw32/pthreads-snap-2004-06-22.tar.gz -Qt4|ftp://www.bacula.org/depkgs-mingw32/qt-win-opensource-src-4.3.4.zip +Qt4|http://www.bacula.org/depkgs-mingw32/qt-win-opensource-src-4.3.4.zip SCONS|http://www.bacula.org/depkgs-mingw32/scons-0.96.92.tar.gz SED|http://www.bacula.org/depkgs-mingw32/sed-4.1.5.tar.gz SQLITE|http://www.bacula.org/depkgs-mingw32/sqlite-3.3.17.tar.gz diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def index 0bda791fe9..1bff88d879 100644 --- a/bacula/src/win32/dll/bacula.def +++ b/bacula/src/win32/dll/bacula.def @@ -722,7 +722,9 @@ _Z18jobstatus_to_asciiiPci _Z19last_path_separatorPKc _Z21set_working_directoryPc _Z5lcasePc - +_Z20volume_status_to_strPKc +_Z22jobstatus_to_ascii_guiiPci + ; var.o _Z10var_configP6var_st12var_config_tz _Z10var_createPP6var_st diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index ae44e8423a..1436c9ece5 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -30,6 +30,8 @@ vtape driver General: +09Jul08 +ebl tweak bat for win32 compilation 08Jul08 ebl Remove tokyo cabinet from the source ebl Update configure/autoconf to support berkeley DB -- 2.39.5