Recursively call fix_device_block_write_error on error

[bacula/bacula] / bacula / src / baconfig.h

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 2d149c02f88bc328eb0ff4e57b51d7cc078732ec..146a701862b40b57ee0f0d70244d53f5385beec4 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -411,6 +411,7 @@ typedef int (INTHANDLER)();
 
 #if defined(HAVE_WIN32)
 typedef int64_t   boffset_t;
+#define caddr_t  char *
 #else
 typedef off_t     boffset_t;
 #endif
@@ -612,8 +613,8 @@ int  m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...)
 #define bmalloc(size) b_malloc(__FILE__, __LINE__, (size))
 #endif
 
-/* Function to simplify free/reset pointers */
-inline void bfree_and_null(void *&a) { if (a) { free(a); a = NULL; } }
+/* Macro to simplify free/reset pointers */
+#define bfree_and_null(a) do{if(a){free(a); (a)=NULL;}} while(0)
 
 /*
  * Replace codes needed in both file routines and non-file routines
@@ -651,8 +652,7 @@ inline void bfree_and_null(void *&a) { if (a) { free(a); a = NULL; } }
 #endif
 
 
-#ifdef __alpha__
-#define OSF 1
+#ifdef HAVE_OSF1_OS
 #undef  ioctl_req_t
 #define ioctl_req_t int
 #endif
@@ -749,4 +749,7 @@ extern "C" int mknod ( const char *path, int mode, dev_t device );
 #endif
 */
 
+/* Determine endiannes */
+static inline bool bigendian() { return htonl(1) == 1L; }
+
 #endif /* _BACONFIG_H */