Fix Win32 build.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5679 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def
index 671872631fa058696bb44901ef3b833f2c0b8ac1..9d75a1dadba6f0ff0de7553fa069be2bc5c62ee8 100644 (file)
--- a/bacula/src/win32/cats/bacula_cats.def
+++ b/bacula/src/win32/cats/bacula_cats.def
@@ -23,9 +23,6 @@ _ZN9dbid_listD1Ev
 _ZN9dbid_listD2Ev\r
  \r
 ; sql_create.o\r
-_Z12my_batch_endP3JCRP4B_DBPKc\r
-_Z14my_batch_startP3JCRP4B_DB\r
-_Z15my_batch_insertP3JCRP4B_DBP8ATTR_DBR\r
 _Z20db_create_job_recordP3JCRP4B_DBP7JOB_DBR\r
 _Z21db_create_pool_recordP3JCRP4B_DBP8POOL_DBR\r
 _Z22db_create_media_recordP3JCRP4B_DBP9MEDIA_DBR\r

diff --git a/bacula/src/win32/cats/make_def b/bacula/src/win32/cats/make_def
index aee776ecf39d39852c9cb1b543adf702dd0602fc..945f86a9b6f3b6b731fd6a104952f37d3e6ffd20 100755 (executable)
--- a/bacula/src/win32/cats/make_def
+++ b/bacula/src/win32/cats/make_def
@@ -10,6 +10,8 @@ echo "LIBRARY bacula_cats.dll"
 echo "EXPORTS"
 echo " "
 
+NM=../../../../../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"
 
@@ -64,11 +66,11 @@ DATA="\
 cd cats_mysql
 for i in ${OBJS}; do \
    echo "; $i"; \
-   nm $i | grep "^[0-9a-f]* T _" | cut -c21-; \
+   ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13-; \
    echo " "; \
 done
 
-nm mysql.o | grep "^[0-9a-f]* T _" | cut -c21- | grep -v "my_mysql"
+${NM} mysql.o | grep "^[0-9a-f]* T _" | cut -c13- | grep -v "my_mysql"
 
 for i in ${DATA}; do \
    echo "$i DATA"; \

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 5f50e3fd11b472bca400c665f0f20662b96783d1..c421822c18ee9cf60624f0e987db403895ee0109 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -1995,7 +1995,7 @@ open_bpipe(char *prog, int wait, const char *mode)
     }
 
     if (wait > 0) {
-        bpipe->timer_id = start_child_timer(bpipe->worker_pid, wait);
+        bpipe->timer_id = start_child_timer(NULL, bpipe->worker_pid, wait);
     }
 
     return bpipe;

diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index 4c928c1e17527f98e3d509a109be344c66ab6fb4..48fa7ccca284318e6022c9d60e7f2f54d9f3add3 100644 (file)
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -251,7 +251,7 @@ _Z12get_bregexpsPKc
 _Z13free_bregexpsP5alist
 _Z14apply_bregexpsPKcP5alistPPc
 _Z19bregexp_build_wherePciS_S_S_
-_Z21bregexp_escape_stringPcS_c
+_Z21bregexp_escape_stringPcPKcc
 _Z28bregexp_get_build_where_sizePcS_S_
 _ZN7BREGEXP10edit_substEPKcP12b_regmatch_t
 _ZN7BREGEXP12return_fnameEPKci
@@ -352,10 +352,10 @@ _Z9tm_encodeP9date_timeP2tm
 _Z16stop_bsock_timerP8btimer_t
 _Z16stop_child_timerP8btimer_t
 _Z17start_bsock_timerP5BSOCKj
-_Z17start_child_timerij
+_Z17start_child_timerP3JCRij
 _Z17stop_thread_timerP8btimer_t
-_Z18start_thread_timerP10pthread_t_j
- 
+_Z18start_thread_timerP3JCRP10pthread_t_j
+
 ; cram-md5.o
 _Z16cram_md5_respondP5BSOCKPKcPiS3_
 _Z18cram_md5_challengeP5BSOCKPKcii

diff --git a/bacula/src/win32/dll/make_def b/bacula/src/win32/dll/make_def
index 6b754c924a72cd3c0bade7da38c84f131584fd23..89b036e0580d9adfabd07f309819ebe4869219e0 100755 (executable)
--- a/bacula/src/win32/dll/make_def
+++ b/bacula/src/win32/dll/make_def
@@ -5,24 +5,15 @@
 #
 #  Kern Sibbald, June 2007
 #
+
+NM=../../../../cross-tools/mingw32/mingw32/bin/nm
  
 echo "LIBRARY bacula.dll"
 echo "EXPORTS"
 echo " "
 
-OBJS="compat.o print.o winapi.o attribs.o bfile.o create_file.o \
-      drivetype.o enable_priv.o find.o find_one.o fstype.o match.o \
-      address_conf.o alist.o attr.o base64.o berrno.o bget_msg.o \
-      bnet.o bnet_server.o bpipe.o breg.o bregex.o bsnprintf.o \
-      bsock.o bsys.o btime.o btimers.o cram-md5.o crc32.o crypto.o \
-      daemon.o dlist.o edit.o fnmatch.o idcache.o jcr.o lex.o md5.o \
-      mem_pool.o message.o pythonlib.o queue.o rblist.o runscript.o \
-      rwlock.o scan.o serial.o smartall.o tls.o tree.o util.o var.o \
-      watchdog.o"
-
-
-for i in ${OBJS}; do \
+for i in *.o ; do \
    echo "; $i"; \
-   nm $i | grep "^[0-9a-f]* T _" | cut -c21-; \
+   ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13- ; \
    echo " "; \
 done

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index b3d4a44b886d80cea5dac2c3096eb3f53afc9131..a9d05f774ff92d191c8027ba963f820d86b85298 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 28Sep07
+kes  Fix Win32 build.
 kes  More tweaks to the mount volume routines to get everything
      right. Changed variable name from find to have_vol, which is
      much easier to understand.