From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 23 Dec 2012 15:18:49 +0000 (+0100)
Subject: Fix TERM defs for Solaris 11 in conio.c
X-Git-Tag: Release-7.0.0~62
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7cdccd8be9549745f543db8bcbcca2ef79b290a1;p=bacula%2Fbacula

Fix TERM defs for Solaris 11 in conio.c
---

diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
index 8a6ffd4e3a..1b39d29918 100755
--- a/bacula/src/console/conio.c
+++ b/bacula/src/console/conio.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 1981-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 1981-2012 Free Software Foundation Europe e.V.
              Yes, that is 1981 no error.
 
    The main author of Bacula is Kern Sibbald, with contributions from
@@ -54,6 +54,7 @@
 #include <signal.h>
 #include <string.h>
 #include <ctype.h>
+#define HAVE_CONIO 1
 #else
 
 /* We are in Bacula */
@@ -61,6 +62,8 @@
 
 #endif
 
+#ifdef HAVE_CONIO
+
 #include <curses.h>
 #include <term.h>
 
@@ -69,8 +72,10 @@
 extern "C" int tgetent(void *, const char *);
 extern "C" int tgetnum(const char *);
 extern "C" char *tgetstr (const char*, char**);
-#endif
+# Note: the following on older (Solaris 10) systems 
+#  may need to be moved to after the #endif
 extern "C" char *tgoto (const char *, int, int);
+#endif
 #elif defined(__sgi)
 extern "C" int tgetent(char *, char *);
 extern "C" int tgetnum(char id[2]);
@@ -1189,3 +1194,5 @@ static void asdell()
 {
    t_send(t_dl);
 }
+
+#endif