6999161a2a
readline turns out to be a bit of a stumbling block for the project to
move gdbsupport (and then gdbserver) to the top-level.
The issue is that readline headers are intended to be included with
names like "readline/readline.h". To support this, gdb effectively
adds a -I option pointing to the top-level source directory -- but,
importantly, this option is not used when the system readline is used.
For gdbsupport, a -I option like this would always be needed, but that
in turn would break the system readline case. This was PR build/17077,
fixed in commit a8a5dbcab8.
Previously, we had discussed this on the gdb-patches list in terms of
removing readline from the tree
https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html
However, Eli expressed some concerns, and Joel did as well (off-list).
Given those concerns, and the fact that a patch-free local readline is
relatively new in gdb (it was locally patched for years), I changed my
mind and decided to handle this situation by moving the readline
sources down a level.
That is, upstream readline is now in readline/readline, and the
top-level readline directory just contains the minimal configury
needed to build that.
This fixes the problem because, when gdb unconditionally adds a
-I$(top_srcdir), this will not find readline headers. A separate -I
will be needed instead, which is exactly what's needed for
--with-system-readline.
gdb/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
gdb/doc/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
readline/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
Move old contents to readline/ subdirectory.
* aclocal.m4, configure, configure.ac, .gitignore, Makefile.am,
Makefile.in, README: New files.
Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4
86 lines
2.4 KiB
C
86 lines
2.4 KiB
C
/* histlib.h -- internal definitions for the history library. */
|
|
|
|
/* Copyright (C) 1989-2009 Free Software Foundation, Inc.
|
|
|
|
This file contains the GNU History Library (History), a set of
|
|
routines for managing the text of previously typed lines.
|
|
|
|
History 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.
|
|
|
|
History 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 History. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#if !defined (_HISTLIB_H_)
|
|
#define _HISTLIB_H_
|
|
|
|
#if defined (HAVE_STRING_H)
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif /* !HAVE_STRING_H */
|
|
|
|
#if !defined (STREQ)
|
|
#define STREQ(a, b) (((a)[0] == (b)[0]) && (strcmp ((a), (b)) == 0))
|
|
#define STREQN(a, b, n) (((n) == 0) ? (1) \
|
|
: ((a)[0] == (b)[0]) && (strncmp ((a), (b), (n)) == 0))
|
|
#endif
|
|
|
|
#ifndef savestring
|
|
#define savestring(x) strcpy (xmalloc (1 + strlen (x)), (x))
|
|
#endif
|
|
|
|
#ifndef whitespace
|
|
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
|
|
#endif
|
|
|
|
#ifndef _rl_digit_p
|
|
#define _rl_digit_p(c) ((c) >= '0' && (c) <= '9')
|
|
#endif
|
|
|
|
#ifndef _rl_digit_value
|
|
#define _rl_digit_value(c) ((c) - '0')
|
|
#endif
|
|
|
|
#ifndef member
|
|
# if !defined (strchr) && !defined (__STDC__)
|
|
extern char *strchr ();
|
|
# endif /* !strchr && !__STDC__ */
|
|
#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
|
|
#endif
|
|
|
|
#ifndef FREE
|
|
# define FREE(x) if (x) free (x)
|
|
#endif
|
|
|
|
/* Possible history errors passed to hist_error. */
|
|
#define EVENT_NOT_FOUND 0
|
|
#define BAD_WORD_SPEC 1
|
|
#define SUBST_FAILED 2
|
|
#define BAD_MODIFIER 3
|
|
#define NO_PREV_SUBST 4
|
|
|
|
/* Possible definitions for history starting point specification. */
|
|
#define NON_ANCHORED_SEARCH 0
|
|
#define ANCHORED_SEARCH 0x01
|
|
#define PATTERN_SEARCH 0x02
|
|
|
|
/* Possible definitions for what style of writing the history file we want. */
|
|
#define HISTORY_APPEND 0
|
|
#define HISTORY_OVERWRITE 1
|
|
|
|
/* internal extern function declarations used by other parts of the library */
|
|
|
|
/* histsearch.c */
|
|
extern int _hs_history_patsearch PARAMS((const char *, int, int));
|
|
|
|
#endif /* !_HISTLIB_H_ */
|