remove GROUP BY on db_get_job_volume_names. REVIEW.

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

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 56922205fbcd00e091d9b5660f13f277921f1a09..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
 
-#define POOLMEM char
 
 /* Types */
 
@@ -82,17 +88,17 @@ typedef uint32_t u_int32_t;
 #  if (SIZEOF_CHAR == 1)
 typedef unsigned char u_int8_t;
 #  else
-#   error "8 bit int type not found."
+#   error "8 bit int type not found. Required!"
 #  endif
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else
-#   error "16 bit int type not found."
+#   error "16 bit int type not found. Required!"
 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else
-#   error "32 bit int type not found."
+#   error "32 bit int type not found. Required!"
 #  endif
 # endif
 #endif
@@ -114,7 +120,7 @@ typedef long int int64_t;
 # ifdef HAVE_INT64_T
 typedef int64_t intmax_t;
 # else
-typedef int32_t intmax_t;
+#   error "64 bit type not found. Required!"
 # endif
 #endif
 
@@ -126,6 +132,8 @@ typedef unsigned long long int u_int64_t;
 #  if (SIZEOF_LONG_INT == 8)
 typedef unsigned long int u_int64_t;
 #   define HAVE_U_INT64_T 1
+#  else
+#   error "64 bit type not found. Required!"
 #  endif
 # endif
 #endif
@@ -134,7 +142,7 @@ typedef unsigned long int u_int64_t;
 # ifdef HAVE_U_INT64_T
 typedef u_int64_t u_intmax_t;
 # else
-typedef u_int32_t u_intmax_t;
+#   error "64 bit type not found. Required!"
 # endif
 #endif
 
@@ -172,8 +180,21 @@ typedef float             float32_t;
 #define uint64_t u_int64_t
 #define uintmax_t u_intmax_t
 
-#define btime_t uint64_t
+/* Bacula time -- Unix time with microseconds */
+#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
+
+#ifdef HAVE_OLD_SOCKOPT
+#define sockopt_val_t char *
+#else
+#define sockopt_val_t void *
+#endif