kes Apply libdbi patch from Joao Freitas for regress and for

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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 49c8624028d4b7037e81391554255ddd3a4cbb5e..00f0a4c928d0c1e0a26f2d1052f05a3f71b3bd6b 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -82,6 +82,12 @@
 void InitWinAPIWrapper();
 
 #define  OSDependentInit()    InitWinAPIWrapper()
+#define  tape_open            win32_tape_open
+#define  tape_ioctl           win32_tape_ioctl
+#define  tape_read            win32_tape_read
+#define  tape_write           win32_tape_write
+#define  tape_close           win32_tape_close
+
 
 #define sbrk(x)  0
 
@@ -106,8 +112,8 @@ void InitWinAPIWrapper();
 #define CATS_IMP_EXP
 
 #define  OSDependentInit()
-#define  tape_open            open
-#define  tape_ioctl           ioctl
+#define  tape_open            ::open
+#define  tape_ioctl           ::ioctl
 #define  tape_read            ::read
 #define  tape_write           ::write
 #define  tape_close           ::close
@@ -645,6 +651,9 @@ inline bool IsPathSeparator(int ch) { return ch == '/' || ch == '\\'; }
 inline char *first_path_separator(char *path) { return strpbrk(path, "/\\"); }
 inline const char *first_path_separator(const char *path) { return strpbrk(path, "/\\"); }
 
+extern void pause_msg(const char *file, const char *func, int line, const char *msg);
+#define pause(msg) if (debug_level) pause_msg(__FILE__, __func__, __LINE__, (msg))
+
 #else
 #define PathSeparator '/'
 /* Define Winsock functions if we aren't on Windows */
@@ -655,6 +664,7 @@ inline const char *first_path_separator(const char *path) { return strpbrk(path,
 inline bool IsPathSeparator(int ch) { return ch == '/'; }
 inline char *first_path_separator(char *path) { return strchr(path, '/'); }
 inline const char *first_path_separator(const char *path) { return strchr(path, '/'); }
+#define pause(msg)
 #endif