From d899204149478fd863e2fd3337a57db958cebed9 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 27 Aug 2005 14:33:39 +0000 Subject: [PATCH] Add compatibility with Microsoft Visual C++ 2005 Express Edition Beta 2 (a complete VC++ IDE available for free). 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 --- bacula/src/lib/bnet.c | 2 +- bacula/src/lib/smartall.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c index cd7d1fc229..23a9953511 100644 --- 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 98305061d5..c646888abe 100644 --- 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) -- 2.39.5