Update copyright + fix a few Win32 warnings

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3686 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 046b28d8b142eceabb1ee760ec80b22436063925..1bef020596c9cffd5fc79f89fa5e3058dfa1e4d3 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -714,6 +714,7 @@ get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
 
 #else /* no readline, do it ourselves */
 
+#if !defined(HAVE_WIN32)
 static bool bisatty(int fd)
 {
    if (no_conio) {
@@ -721,6 +722,7 @@ static bool bisatty(int fd)
    }
    return isatty(fd);
 }
+#endif
 
 /*
  *   Returns: 1 if data available

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index e6d9563e8242ddd7be4d7f5257f172b1bb614772..459a9caa94de46d1d2fe53ed145d6ed2fe11993b 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -337,8 +337,10 @@ void DEVICE::open_tape_device(DCR *dcr, int omode)
 {
    file_size = 0;
    int timeout = max_open_wait;
+#if !defined(HAVE_WIN32)
    struct mtop mt_com;
    utime_t start_time = time(NULL);
+#endif
 
 
    Dmsg0(29, "Open dev: device is tape\n");