This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / bc_types.h

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index f213acab3c874e41ad52e853e09abd9b5aaffb26..a27c3270dfee06b1f0f03341a6ae50ad320caf44 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -8,7 +8,6 @@
 
     int8_t,  int16_t,  int32_t,  int64_t
     uint8_t, uint16_t, uint32_t, uint64_t
-    float32_t, float64_t
 
     Also, we define types such as file address lengths.
 
@@ -39,10 +38,17 @@
 #ifndef __bc_types_INCLUDED
 #define __bc_types_INCLUDED
 
-/* ****FIXME***** implement 64 bit file addresses ! */
-#define faddr_t long 
+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 */
 
@@ -175,11 +181,20 @@ typedef float             float32_t;
 #define uintmax_t u_intmax_t
 
 /* 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 socklen_t int
 #define int_least16_t int32_t
 #endif
+
+#ifndef HAVE_SOCKLEN_T
+#define socklen_t int
+#endif
+
+#ifdef HAVE_OLD_SOCKOPT
+#define sockopt_val_t char *
+#else
+#define sockopt_val_t void *
+#endif