X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Fsmartall.h;h=439f990ea148011e1ff3b67bcbee330fec8d9965;hb=95c6245affef4000580427d5e0855227dedcd9dc;hp=98305061d5d0c34b181b60d444a90ba85570ac5a;hpb=66696d1cadedbb362c392dadce9a8ce275dd5d80;p=bacula%2Fbacula

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index 98305061d5..439f990ea1 100644
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -1,35 +1,30 @@
 /*
 
-	Definitions for the smart memory allocator
+        Definitions for the smart memory allocator
 
      Version $Id$
 
 */
 
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
-extern uint64_t sm_max_bytes;
-extern uint64_t sm_bytes;
-extern uint32_t sm_max_buffers;
-extern uint32_t sm_buffers;
+extern uint64_t DLL_IMP_EXP sm_max_bytes;
+extern uint64_t DLL_IMP_EXP sm_bytes;
+extern uint32_t DLL_IMP_EXP sm_max_buffers;
+extern uint32_t DLL_IMP_EXP sm_buffers;
 
 #ifdef  SMARTALLOC
 #undef  SMARTALLOC
@@ -37,15 +32,15 @@ extern uint32_t sm_buffers;
 
 
 extern void *sm_malloc(const char *fname, int lineno, unsigned int nbytes),
-	    *sm_calloc(const char *fname, int lineno,
-		unsigned int nelem, unsigned int elsize),
-	    *sm_realloc(const char *fname, int lineno, void *ptr, unsigned int size),
-	    *actuallymalloc(unsigned int size),
-	    *actuallycalloc(unsigned int nelem, unsigned int elsize),
-	    *actuallyrealloc(void *ptr, unsigned int size);
+            *sm_calloc(const char *fname, int lineno,
+                unsigned int nelem, unsigned int elsize),
+            *sm_realloc(const char *fname, int lineno, void *ptr, unsigned int size),
+            *actuallymalloc(unsigned int size),
+            *actuallycalloc(unsigned int nelem, unsigned int elsize),
+            *actuallyrealloc(void *ptr, unsigned int size);
 extern void sm_free(const char *fname, int lineno, void *fp);
 extern void actuallyfree(void *cp),
-	    sm_dump(bool bufdump), sm_static(int mode);
+            sm_dump(bool bufdump), sm_static(int mode);
 extern void sm_new_owner(const char *fname, int lineno, char *buf);
 
 #ifdef SMCHECK
@@ -100,12 +95,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)
@@ -142,19 +137,19 @@ class SMARTALLOC
    public:
       void *operator new(size_t s)
       {
-	  return malloc(s);
+          return malloc(s);
       }
       void *operator new[](size_t s)
       {
-	  return malloc(s);
+          return malloc(s);
       }
       void  operator delete(void *ptr)
       {
-	  free(ptr);
+          free(ptr);
       }
       void  operator delete[](void *ptr, size_t i)
       {
-	  free(ptr);
+          free(ptr);
       }
 };
 #endif