Tweak Win32 build

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 048872ab0d84ca05c0fb81cbe516e71bde5d8630..4d088abe2d7e2f3148c2d2ebc881c8fefb6dae8c 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -76,7 +76,10 @@ BSOCK *    bnet_connect          (JCR *jcr, int retry_interval,
 void       bnet_close            (BSOCK *bsock);
 BSOCK *    init_bsock            (JCR *jcr, int sockfd, const char *who, const char *ip,
                                   int port, struct sockaddr *client_addr);
-int       bnet_get_peer           (BSOCK *bs, char *buf, socklen_t buflen);
+#ifdef HAVE_WIN32
+#define socklen_t int
+#endif
+int        bnet_get_peer           (BSOCK *bs, char *buf, socklen_t buflen);
 BSOCK *    dup_bsock             (BSOCK *bsock);
 void       term_bsock            (BSOCK *bsock);
 const char *bnet_strerror         (BSOCK *bsock);

diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak
index 7f135887972caf345ca4709073549126a777073f..9a5e9434731b822bf769410b66ccafb7e932555d 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.mak
+++ b/bacula/src/win32/baculafd/baculafd.mak
@@ -1016,7 +1016,7 @@ SOURCE=..\findlib\create_file.cpp
 
 !ENDIF 
 
-SOURCE=..\findlib\crypto.cpp
+SOURCE=..\lib\crypto.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"
 

diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist
index 9f044978aea680eac33de4922c84c9a8c6b6b5ad..da2a6cbc21ae6e444f7991f84544b6288a06166a 100644 (file)
--- a/bacula/src/win32/wx-console/filelist
+++ b/bacula/src/win32/wx-console/filelist
@@ -6,7 +6,6 @@
 ..\lib\berrno
 ..\lib\bget_msg
 ..\lib\bnet
-..\lib\bnet_pkt
 ..\lib\bnet_server
 ..\lib\bshm
 ..\lib\bsys

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index 863dd927c8b45f33a9dcddc4923cc512977db0b4..58fc769b476e0bf82b5dcb1fb473b3df3c775d5b 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -48,7 +48,6 @@ CLEAN :
        -@erase "$(INTDIR)\berrno.obj"
        -@erase "$(INTDIR)\bget_msg.obj"
        -@erase "$(INTDIR)\bnet.obj"
-       -@erase "$(INTDIR)\bnet_pkt.obj"
        -@erase "$(INTDIR)\bnet_server.obj"
        -@erase "$(INTDIR)\bshm.obj"
        -@erase "$(INTDIR)\bsys.obj"
@@ -126,7 +125,6 @@ LINK32_OBJS= \
        "$(INTDIR)\berrno.obj" \
        "$(INTDIR)\bget_msg.obj" \
        "$(INTDIR)\bnet.obj" \
-       "$(INTDIR)\bnet_pkt.obj" \
        "$(INTDIR)\bnet_server.obj" \
        "$(INTDIR)\bshm.obj" \
        "$(INTDIR)\bsys.obj" \
@@ -213,8 +211,6 @@ CLEAN :
        -@erase "$(INTDIR)\bget_msg.sbr"
        -@erase "$(INTDIR)\bnet.obj
        -@erase "$(INTDIR)\bnet.sbr"
-       -@erase "$(INTDIR)\bnet_pkt.obj
-       -@erase "$(INTDIR)\bnet_pkt.sbr"
        -@erase "$(INTDIR)\bnet_server.obj
        -@erase "$(INTDIR)\bnet_server.sbr"
        -@erase "$(INTDIR)\bshm.obj
@@ -339,7 +335,6 @@ BSC32_SBRS= \
        "$(INTDIR)\berrno.sbr" \
        "$(INTDIR)\bget_msg.sbr" \
        "$(INTDIR)\bnet.sbr" \
-       "$(INTDIR)\bnet_pkt.sbr" \
        "$(INTDIR)\bnet_server.sbr" \
        "$(INTDIR)\bshm.sbr" \
        "$(INTDIR)\bsys.sbr" \
@@ -412,7 +407,6 @@ LINK32_OBJS= \
        "$(INTDIR)\berrno.obj" \
        "$(INTDIR)\bget_msg.obj" \
        "$(INTDIR)\bnet.obj" \
-       "$(INTDIR)\bnet_pkt.obj" \
        "$(INTDIR)\bnet_server.obj" \
        "$(INTDIR)\bshm.obj" \
        "$(INTDIR)\bsys.obj" \
@@ -670,25 +664,6 @@ SOURCE=..\lib\bnet.cpp
 !ENDIF 
 
 
-FILENAME=bnet_pkt
-SOURCE=..\lib\bnet_pkt.cpp
-!IF  "$(CFG)" == "wx-console - Win32 Release"
-
-
-"$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
-
-
-"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-
 FILENAME=bnet_server
 SOURCE=..\lib\bnet_server.cpp
 !IF  "$(CFG)" == "wx-console - Win32 Release"