new devel_bacula + fixes to conio/console

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

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index e55b377bb23d07457463a06dcc87f75b0d4b313c..a27c3270dfee06b1f0f03341a6ae50ad320caf44 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -40,11 +40,12 @@
 
 typedef char POOLMEM;   
 #define mp_chr(x) x
-#ifdef xxxxx
+#ifdef  xxxxx
 #define mp_chr(x) ((char*)(x))
-struct POOLMEM { 
-   POOLMEM() {}
-   operator const char*() const { return (char *)this; }
+class POOLMEM { 
+public:
+   POOLMEM();
+   operator char * const() { return this; }
 };
 #endif
 
@@ -180,7 +181,7 @@ 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