[PATCHSET] [4/4] Fix various issue in TUI

Eli Zaretskii
2014-12-31T17:56:48Z

Well, one patch is Windows-specific after all. This patch makes sure
windows-termcap is not compiled when GDB is linked against ncurses,
and also makes the file a no-op should it compile in that
configuration. This is to avoid shadowing of ncurses functions by the
stubs in windows-termcap.c.

OK to commit?

2014-12-31 Eli Zaretskii <eliz@gnu.org>

* gdb/configure.ac [mingw32]: Don't add windows-termcap.o to
CONFIG_OBJS if a curses library is going to be used.

* gdb/windows-termcap.c: Make the entire file a no-op if any
kind of curses library i being used.

--- gdb/configure.ac~0 2014-10-29 21:45:50 +0200
+++ gdb/configure.ac 2014-12-30 07:42:27 +0200
@@ -627,9 +627,10 @@
ac_cv_search_tgetent="none required"
;;
*mingw32*)
- ac_cv_search_tgetent="none required"
- CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
- ;;
+ if test x"$prefer_curses" = xyes; then
+ ac_cv_search_tgetent="none required"
+ CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
+ fi ;;
esac

# These are the libraries checked by Readline.

--- gdb/windows-termcap.c~0 2014-06-11 18:34:41 +0300
+++ gdb/windows-termcap.c 2014-12-29 15:42:44 +0200
@@ -19,6 +19,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */

+
+#include "config.h"
+
+#if !defined HAVE_CURSES_H && !defined HAVE_NCURSES_H && !defined HAVE_NCURSES_NCURSES_H
+
#include <stdlib.h>

/* -Wmissing-prototypes */
@@ -71,3 +76,5 @@
{
return NULL;
}
+
+#endif /* !HAVE_CURSES_H && !HAVE_NCURSES_H && !HAVE_NCURSES_NCURSES_H */