Update win32 dir for delete of btree.c and addition of rblist.c

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

diff --git a/bacula/src/win32/dll/Makefile b/bacula/src/win32/dll/Makefile
index b2cf7111255ad07c926cf994111ae9878addbb71..1925463f17f3ccf90f5b9bbb83093f02ada8e25f 100644 (file)
--- a/bacula/src/win32/dll/Makefile
+++ b/bacula/src/win32/dll/Makefile
@@ -58,7 +58,6 @@ LIB_OBJS = \
        $(OBJDIR)/bsys.o \
        $(OBJDIR)/btime.o \
        $(OBJDIR)/btimers.o \
-       $(OBJDIR)/btree.o \
        $(OBJDIR)/cram-md5.o \
        $(OBJDIR)/crc32.o \
        $(OBJDIR)/crypto.o \
@@ -78,6 +77,7 @@ LIB_OBJS = \
        $(OBJDIR)/openssl.o \
        $(OBJDIR)/pythonlib.o \
        $(OBJDIR)/queue.o \
+       $(OBJDIR)/rblist.o \
        $(OBJDIR)/runscript.o \
        $(OBJDIR)/rwlock.o \
        $(OBJDIR)/scan.o \

diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index c06ae297505c31d2460394046eb39f45dec3bef1..4304031129c591b74b0ab69a940a25b7d0184263 100644 (file)
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -220,8 +220,6 @@ _Z17start_bsock_timerP5BSOCKj
 _Z17stop_thread_timerP10s_btimer_t
 _Z18start_thread_timerP10pthread_t_j
 
-; btree.c:
-
 ; cram-md5.c:
 _Z16cram_md5_respondP5BSOCKPcPiS2_
 _Z18cram_md5_challengeP5BSOCKPcii
@@ -391,6 +389,14 @@ _Z5qnextP7b_queueS0_
 _Z7qdchainP7b_queue
 _Z7qinsertP7b_queueS0_
 
+; rblist.c:
+_ZN6rblist4nextEPv
+_ZN6rblist5firstEv
+_ZN6rblist6insertEPvPFiS0_S0_E
+_ZN6rblist6removeEPv
+_ZN6rblist6searchEPvPFiS0_S0_E
+_ZN6rblist7destroyEv
+
 ; runscript.c:
 _Z11run_scriptsP3JCRP5alistPKc
 _Z13new_runscriptv

diff --git a/bacula/src/win32/libbac/Makefile b/bacula/src/win32/libbac/Makefile
index 28c94f8df5472bd9f0b8809e67e094dfac5dddc8..993c22ad6a463dd9f512ac80241439c16c33ac79 100644 (file)
--- a/bacula/src/win32/libbac/Makefile
+++ b/bacula/src/win32/libbac/Makefile
@@ -41,7 +41,6 @@ LIB_OBJS = \
        $(OBJDIR)/bsys.o \
        $(OBJDIR)/btime.o \
        $(OBJDIR)/btimers.o \
-       $(OBJDIR)/btree.o \
        $(OBJDIR)/cram-md5.o \
        $(OBJDIR)/crc32.o \
        $(OBJDIR)/crypto.o \
@@ -62,6 +61,7 @@ LIB_OBJS = \
        $(OBJDIR)/parse_conf.o \
        $(OBJDIR)/pythonlib.o \
        $(OBJDIR)/queue.o \
+       $(OBJDIR)/rblist.o \
        $(OBJDIR)/res.o \
        $(OBJDIR)/runscript.o \
        $(OBJDIR)/rwlock.o \