X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbc_types.h;h=81595edb9e7a02484dd91bd05cd358f55e403b28;hb=b0885fec1b05e4155635356e7ba50a2209c7cbb1;hp=f08027e26d41a0358488ac506d70b34f263910a0;hpb=7ed025898732d2e8fbbea4e2f1c2fb9cbf74892b;p=bacula%2Fbacula

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index f08027e26d..81595edb9e 100644
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -15,22 +15,17 @@
 
  */
 /*
-   Copyright (C) 2000, 2001, 2002 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.
 
  */
 
@@ -38,16 +33,7 @@
 #ifndef __bc_types_INCLUDED
 #define __bc_types_INCLUDED
 
-typedef char POOLMEM;   
-#define mp_chr(x) x
-#ifdef  xxxxx
-#define mp_chr(x) ((char*)(x))
-class POOLMEM { 
-public:
-   POOLMEM() { }
-   operator char * const() { return this; }
-};
-#endif
+typedef char POOLMEM;
 
 
 /* Types */
@@ -148,14 +134,14 @@ typedef u_int64_t u_intmax_t;
 
 
 /* Limits for the above types. */
-#undef INT8_MIN  
-#undef INT8_MAX  
-#undef UINT8_MAX 
-#undef INT16_MIN 
-#undef INT16_MAX 
+#undef INT8_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#undef INT16_MIN
+#undef INT16_MAX
 #undef UINT16_MAX
-#undef INT32_MIN 
-#undef INT32_MAX 
+#undef INT32_MIN
+#undef INT32_MAX
 #undef UINT32_MAX
 
 #define INT8_MIN        (-127-1)
@@ -174,21 +160,19 @@ typedef float             float32_t;
 #endif /* __bc_types_INCLUDED */
 
 /* Define the uint versions actually used in Bacula */
+#ifndef uint8_t
 #define uint8_t u_int8_t
 #define uint16_t u_int16_t
 #define uint32_t u_int32_t
 #define uint64_t u_int64_t
 #define uintmax_t u_intmax_t
+#endif
 
 /* Bacula time -- Unix time with microseconds */
-#define btime_t uint64_t
+#define btime_t int64_t
 /* Unix time (time_t) widened to 64 bits */
 #define utime_t int64_t
 
-#ifdef HAVE_CYGWIN
-#define int_least16_t int32_t
-#endif
-
 #ifndef HAVE_SOCKLEN_T
 #define socklen_t int
 #endif