Add compatibility with Microsoft Visual C++ 2005 Express Edition Beta 2 (a complete...

It should not break MSVC++ 2003 compatibility.
(src/win32/README.vc8 will be completed later)

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

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index cd7d1fc229dbb838f3990d403a6cf654260e8f00..23a995351116bd7004c9bf8631fe7571c94e8ad7 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -796,7 +796,7 @@ static BSOCK *bnet_open(JCR * jcr, const char *name, char *host, char *service,
       /* connect to server */
       if (connect(sockfd, ipaddr->get_sockaddr(), ipaddr->get_sockaddr_len()) < 0) {
          save_errno = errno;
-         close(sockfd);
+         socketClose(sockfd);
          continue;
       }
       *fatal = 0;

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index 98305061d5d0c34b181b60d444a90ba85570ac5a..c646888abea80449455e91808dcef5faf4ea6e1b 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -100,12 +100,12 @@ public:
 
 void *operator new(size_t s, const char *fname, int line)
 {
-  void *p = sm_malloc(fname, line, s > sizeof(int) ? s : sizeof(int));
+  void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
   return p;
 }
 void *operator new[](size_t s, const char *fname, int line)
 {
-   void *p = sm_malloc(fname, line, s > sizeof(int) ? s : sizeof(int));
+   void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
    return p;
 }
 void  operator delete(void *ptr)