Some VC++ modifications

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

diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index 1dfac7dbddde1501a5a712262cc938050e36a5d3..1b5fcb4ed911a84ef2f65b8d4096f9c629fc11a9 100644 (file)
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -532,13 +532,14 @@ void free_addresses(dlist * addrs)
 
 int sockaddr_get_port_net_order(const struct sockaddr *client_addr)
 {
-   /* MA BUG 6 remove ifdefs */
    if (client_addr->sa_family == AF_INET) {
       return ((struct sockaddr_in *)client_addr)->sin_port;
    }
+#ifdef HAVE_IPV6
    else {
       return ((struct sockaddr_in6 *)client_addr)->sin6_port;
    }
+#endif
    return -1;
 }
 

diff --git a/bacula/src/lib/htable.c b/bacula/src/lib/htable.c
index 130adf86ab3e408c54f7b1b6f894404adf02022c..3769c8bec8b484306c7a117a488683b6de9e3a19 100644 (file)
--- a/bacula/src/lib/htable.c
+++ b/bacula/src/lib/htable.c
@@ -90,6 +90,7 @@ void htable::init(void *item, void *link, int tsize)
    walk_index = 0;
 }
 
+#ifdef xxx
 void * htable::operator new(size_t)
 {
    return malloc(sizeof(htable));
@@ -100,6 +101,7 @@ void htable::operator delete(void *tbl)
    ((htable *)tbl)->destroy();
    free(tbl);
 }
+#endif
 
 uint32_t htable::size()
 {

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index 2918d58025562939e75d547ab42fa82bdbfcc4fa..f4c0cc97353dcbcb1be8ab7dcdbb9ce1c0209d85 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -58,6 +58,7 @@ class htable : public SMARTALLOC {
    void grow_table();                 /* grow the table */
 public:
    htable(void *item, void *link, int tsize = 31);
+   ~htable() { destroy(); }
    void init(void *item, void *link, int tsize = 31);
    bool  insert(char *key, void *item);
    void *lookup(char *key);

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index 82685a3e76435081b9b47b3e6c3a7eb7e43c1f0d..3f202974b6c4f97b8bcb7cee1086f86cb549fe1e 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -117,6 +117,16 @@ void  operator delete[](void *ptr, size_t i)
    free(ptr);
 }
 
+void  operator delete(void *ptr, const char *fname, int line)
+{
+   free(ptr);
+}
+void  operator delete[](void *ptr, size_t i, const char *fname, int line) 
+{
+   free(ptr);
+}
+
+
 private:
 void *operator new(size_t s) throw() { return 0; }
 void *operator new[](size_t s) throw() { return 0; }