From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23054 invoked by alias); 31 Dec 2014 17:56:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23043 invoked by uid 89); 31 Dec 2014 17:56:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_SEMBACKSCATTER,SPF_SOFTFAIL,URIBL_BLACK autolearn=no version=3.3.2 X-HELO: mtaout25.012.net.il Received: from mtaout25.012.net.il (HELO mtaout25.012.net.il) (80.179.55.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Dec 2014 17:56:46 +0000 Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NHG00L00JT7PL00@mtaout25.012.net.il> for gdb-patches@sourceware.org; Wed, 31 Dec 2014 19:52:37 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NHG00FESKBNN170@mtaout25.012.net.il> for gdb-patches@sourceware.org; Wed, 31 Dec 2014 19:52:37 +0200 (IST) Date: Wed, 31 Dec 2014 17:56:00 -0000 From: Eli Zaretskii Subject: [PATCHSET] [4/4] Fix various issue in TUI To: gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83vbkrbt4d.fsf@gnu.org> X-IsSubscribed: yes X-SW-Source: 2014-12/txt/msg00696.txt.bz2 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 * 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 . */ + +#include "config.h" + +#if !defined HAVE_CURSES_H && !defined HAVE_NCURSES_H && !defined HAVE_NCURSES_NCURSES_H + #include /* -Wmissing-prototypes */ @@ -71,3 +76,5 @@ { return NULL; } + +#endif /* !HAVE_CURSES_H && !HAVE_NCURSES_H && !HAVE_NCURSES_NCURSES_H */