kes Add back code to open tape device nonblocking, but if rewind fails

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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index f052b13cdead87fc852e32849673cfcfc8584b17..4debd4f4440d86d7c102ae2975a4601279ccbfb0 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -66,9 +66,40 @@
 #define NPRT(x) (x)?(x):_("*None*")
  
 #if defined(HAVE_WIN32)
+void InitWinAPIWrapper();
+
+#define  OSDependentInit()    InitWinAPIWrapper()
+
 #undef ENABLE_NLS
+
+#if defined(BUILDING_DLL)
+#  define DLL_IMP_EXP   _declspec(dllexport)
+#elif defined(USING_DLL)
+#  define DLL_IMP_EXP   _declspec(dllimport)
+#else
+#  define DLL_IMP_EXP
+#endif
+
+#if defined(USING_CATS)
+#  define CATS_IMP_EXP   _declspec(dllimport)
+#else
+#  define CATS_IMP_EXP
 #endif
 
+#else
+
+#define DLL_IMP_EXP
+#define CATS_IMP_EXP
+
+#define  OSDependentInit()
+#define  tape_open            open
+#define  tape_ioctl           ioctl
+#define  tape_read            read
+#define  tape_write           write
+#define  tape_close           ::close
+#endif
+
+
 #ifdef ENABLE_NLS
    #include <libintl.h>
    #include <locale.h>
@@ -476,7 +507,7 @@ int  m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...)
 
 
 /* Use our strdup with smartalloc */
-#ifndef __WXGTK__
+#ifndef HAVE_WXCONSOLE
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
 #endif