darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't use windows-termcap.c when linking against a curses library

Browse source 
gdb/
2015-01-17  Eli Zaretskii  <eliz@gnu.org>

        * configure.ac [*mingw32*]: Only add windows-termcap.o to
        CONFIG_OBS if not building with a curses library.
        * configure: Regenerate.

        * windows-termcap.c: Include defs.h.  Make the whole body empty if
        either one of HAVE_CURSES_H or HAVE_NCURSES_H or
        HAVE_NCURSES_NCURSES_H is defined.
This commit is contained in:
Eli Zaretskii 2015-01-19 16:34:29 +01:00 committed by Joel Brobecker
parent 1f99f6d068
commit 63413d8587
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gdb/ChangeLog
View file

@ -1,3 +1,13 @@
2015-01-19 Eli Zaretskii <eliz@gnu.org>
* configure.ac [*mingw32*]: Only add windows-termcap.o to
CONFIG_OBS if not building with a curses library.
* configure: Regenerate.
* windows-termcap.c: Include defs.h. Make the whole body empty if
either one of HAVE_CURSES_H or HAVE_NCURSES_H or
HAVE_NCURSES_NCURSES_H is defined.
2015-01-19 Joel Brobecker <brobecker@adacore.com>
* rs6000-tdep.c (rs6000_gdbarch_init): Move divide operator

7
gdb/configure vendored
View file

@ -7188,9 +7188,10 @@ case $host_os in
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.

7
gdb/configure.ac
View file

@ -611,9 +611,10 @@ case $host_os in
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.

7
gdb/windows-termcap.c
View file

@ -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 "defs.h"
#if !defined HAVE_CURSES_H && !defined HAVE_NCURSES_H && !defined HAVE_NCURSES_NCURSES_H
#include <stdlib.h>
/* -Wmissing-prototypes */
@ -71,3 +76,5 @@ tgoto (const char *cap, int col, int row)
{
return NULL;
}
#endif /* !HAVE_CURSES_H && !HAVE_NCURSES_H && !HAVE_NCURSES_NCURSES_H */