Apply patch submitted for bug #1107 with a small modification.

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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index f965033d606cce62f5f714d79222ce2d5178a170..415c0e46342cd1d0bf4fd2b4a4c5a6958e84e0e8 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -79,18 +79,17 @@
 #define NPRT(x) (x)?(x):_("*None*")
  
 #if defined(HAVE_WIN32)
+
+#define WIN32_REPARSE_POINT 1
+#define WIN32_MOUNT_POINT   2
+
 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  IS_TAPE(x)           S_ISCHR(x)
 
 #define sbrk(x)  0
 
+#define clear_thread_id(x) memset(&(x), 0, sizeof(x))
 
 #if defined(BUILDING_DLL)
 #  define DLL_IMP_EXP   _declspec(dllexport)
@@ -108,27 +107,13 @@ void InitWinAPIWrapper();
 
 #else  /* HAVE_WIN32 */
 
+#define clear_thread_id(x) x = 0
+
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 
 #define  OSDependentInit()
 
-#if defined(USE_FAKETAPE)
-#  define  tape_open            faketape_open
-#  define  tape_ioctl           faketape_ioctl
-#  define  tape_read            faketape_read
-#  define  tape_write           faketape_write
-#  define  tape_close           faketape_close
-#  define  IS_TAPE(x)           S_ISREG(x)
-#else  /* UNIX && !FAKETAPE */
-#  define  tape_open            ::open
-#  define  tape_ioctl           ::ioctl
-#  define  tape_read            ::read
-#  define  tape_write           ::write
-#  define  tape_close           ::close
-#  define  IS_TAPE(x)           S_ISCHR(x)
-#endif
-
 #endif /* HAVE_WIN32 */