Preparation for using this on all hosts.
Confirmed that --host=x86_64-w64-mingw32 still builds the stub
termcap.
gdb/ChangeLog:
2015-02-26 Pedro Alves <palves@redhat.com>
* windows-termcap.c: Rename to ...
* stub-termcap.c: ... this. Adjust header line.
* Makefile.in (SFILES): Refer to stub-termcap.c instead of
windows-termcap.c.
* configure: Regenerate.
* configure.ac: Refer to stub-termcap.o instead of
windows-termcap.o.
* gdb_curses.h: Mention stub-termcap.c instead of
windows-termcap.c.
+2015-02-26 Pedro Alves <palves@redhat.com>
+
+ * windows-termcap.c: Rename to ...
+ * stub-termcap.c: ... this. Adjust header line.
+ * Makefile.in (SFILES): Refer to stub-termcap.c instead of
+ windows-termcap.c.
+ * configure: Regenerate.
+ * configure.ac: Refer to stub-termcap.o instead of
+ windows-termcap.o.
+ * gdb_curses.h: Mention stub-termcap.c instead of
+ windows-termcap.c.
+
2015-02-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* compile/compile-c-symbols.c (convert_one_symbol, convert_symbol_bmsym)
jit.c \
xml-syscall.c \
annotate.c common/signals.c copying.c dfp.c gdb.c inf-child.c \
- sol-thread.c windows-termcap.c \
+ sol-thread.c stub-termcap.c \
common/gdb_vecs.c common/common-utils.c common/xml-utils.c \
common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \
common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \
*mingw32*)
if test x"$curses_found" != xyes; then
ac_cv_search_tgetent="none required"
- CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
+ CONFIG_OBS="$CONFIG_OBS stub-termcap.o"
fi ;;
esac
*mingw32*)
if test x"$curses_found" != xyes; then
ac_cv_search_tgetent="none required"
- CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
+ CONFIG_OBS="$CONFIG_OBS stub-termcap.o"
fi ;;
esac
#include <term.h>
#else
/* On MinGW, a real termcap library is usually not present. Stub versions
- of the termcap functions will be built from windows-termcap.c. Readline
+ of the termcap functions will be built from stub-termcap.c. Readline
provides its own extern declarations when there's no termcap.h; do the
same here for the termcap functions used in GDB. */
extern int tgetnum (const char *);
--- /dev/null
+/* A very minimal do-nothing termcap emulation stub.
+
+ Copyright (C) 2005-2015 Free Software Foundation, Inc.
+
+ Contributed by CodeSourcery, LLC.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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 "defs.h"
+
+#include <stdlib.h>
+
+/* -Wmissing-prototypes */
+extern int tgetent (char *buffer, char *termtype);
+extern int tgetnum (char *name);
+extern int tgetflag (char *name);
+extern char* tgetstr (char *name, char **area);
+extern int tputs (char *string, int nlines, int (*outfun) ());
+extern char *tgoto (const char *cap, int col, int row);
+
+/* Each of the files below is a minimal implementation of the standard
+ termcap function with the same name, suitable for use in a Windows
+ console window. */
+
+int
+tgetent (char *buffer, char *termtype)
+{
+ return -1;
+}
+
+int
+tgetnum (char *name)
+{
+ return -1;
+}
+
+int
+tgetflag (char *name)
+{
+ return -1;
+}
+
+char *
+tgetstr (char *name, char **area)
+{
+ return NULL;
+}
+
+int
+tputs (char *string, int nlines, int (*outfun) ())
+{
+ while (*string)
+ outfun (*string++);
+
+ return 0;
+}
+
+char *
+tgoto (const char *cap, int col, int row)
+{
+ return NULL;
+}
+++ /dev/null
-/* Win32 termcap emulation.
-
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
-
- Contributed by CodeSourcery, LLC.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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 "defs.h"
-
-#include <stdlib.h>
-
-/* -Wmissing-prototypes */
-extern int tgetent (char *buffer, char *termtype);
-extern int tgetnum (char *name);
-extern int tgetflag (char *name);
-extern char* tgetstr (char *name, char **area);
-extern int tputs (char *string, int nlines, int (*outfun) ());
-extern char *tgoto (const char *cap, int col, int row);
-
-/* Each of the files below is a minimal implementation of the standard
- termcap function with the same name, suitable for use in a Windows
- console window. */
-
-int
-tgetent (char *buffer, char *termtype)
-{
- return -1;
-}
-
-int
-tgetnum (char *name)
-{
- return -1;
-}
-
-int
-tgetflag (char *name)
-{
- return -1;
-}
-
-char *
-tgetstr (char *name, char **area)
-{
- return NULL;
-}
-
-int
-tputs (char *string, int nlines, int (*outfun) ())
-{
- while (*string)
- outfun (*string++);
-
- return 0;
-}
-
-char *
-tgoto (const char *cap, int col, int row)
-{
- return NULL;
-}