diff options
| -rw-r--r-- | readline/ChangeLog | 6 | ||||
| -rw-r--r-- | readline/Makefile.in | 11 | ||||
| -rw-r--r-- | readline/readline.c | 14 |
3 files changed, 19 insertions, 12 deletions
diff --git a/readline/ChangeLog b/readline/ChangeLog index 38d7f2e..7596307 100644 --- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 11 20:50:29 1991 Steve Chamberlain (sac at cygnus.com) + + * Makefile.in: Use the MINUS_G no-debug convention + * readline.c: (many_places) move all the declarations of rindex to + only one place, to reduce the number of warnings it makes. + Sat Nov 9 03:19:40 1991 John Gilmore (gnu at cygnus.com) * configure.in: Make a link for sysdep.h. Specify commontargets. diff --git a/readline/Makefile.in b/readline/Makefile.in index 5c23b08..eda231a 100644 --- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -4,7 +4,7 @@ srcdir = . -destdir = /usr/local +ddestdir = /usr/local INSTALL_PROG = install -c INSTALL_FILE = $(INSTALL_PROG) @@ -19,8 +19,8 @@ INSTALL_FILE = $(INSTALL_PROG) # Destination installation directory. The libraries are copied to DESTDIR # when you do a `make install', and the header files to INCDIR/readline/*.h. -DESTDIR = $(destdir)/lib -INCDIR = $(destdir)/include +DESTDIR = $(ddestdir)/lib +INCDIR = $(ddestdir)/include # Define TYPES as -DVOID_SIGHANDLER if your operating system uses # a return type of "void" for signal handlers. @@ -36,7 +36,8 @@ TYPES = -DVOID_SIGHANDLER # the vi line editing mode and features. READLINE_DEFINES = $(TYPES) -DVI_MODE -DEBUG_FLAGS = -g +MINUS_G=-g +DEBUG_FLAGS = $(MINUS_G) LDFLAGS = $(DEBUG_FLAGS) CFLAGS = $(DEBUG_FLAGS) $(SYSV) -I. @@ -146,5 +147,5 @@ force: # with the gnu make, this is done automatically. -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) +Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) $(SHELL) ./config.status diff --git a/readline/readline.c b/readline/readline.c index 5238bcf..a8363c5 100644 --- a/readline/readline.c +++ b/readline/readline.c @@ -2204,12 +2204,12 @@ rl_deprep_terminal () int allow_pathname_alphabetic_chars = 0; char *pathname_alphabetic_chars = "/-_=~.#$"; - +char *rindex (); int alphabetic (c) int c; { - char *rindex (); + if (pure_alphabetic (c) || (numeric (c))) return (1); @@ -3322,7 +3322,7 @@ rl_complete_internal (what_to_do) /* Handle simple case first. What if there is only one answer? */ if (!matches[1]) { - char *rindex (), *temp; + char *temp; if (rl_filename_completion_desired) temp = rindex (matches[0], '/'); @@ -3345,7 +3345,7 @@ rl_complete_internal (what_to_do) is. */ for (i = 1; matches[i]; i++) { - char *rindex (), *temp = (char *)NULL; + char *temp = (char *)NULL; /* If we are hacking filenames, then only count the characters after the last slash in the pathname. */ @@ -3412,7 +3412,7 @@ rl_complete_internal (what_to_do) } else { - char *rindex (), *temp = (char *)NULL; + char *temp = (char *)NULL; if (rl_filename_completion_desired) temp = rindex (matches[l], '/'); @@ -4639,7 +4639,7 @@ filename_completion_function (text, state) /* If we don't have any state, then do some initialization. */ if (!state) { - char *rindex (), *temp; + char *temp; if (dirname) free (dirname); if (filename) free (filename); @@ -5195,7 +5195,7 @@ rl_parse_and_bind (string) char *string; { extern char *possible_control_prefixes[], *possible_meta_prefixes[]; - char *rindex (), *funname, *kname; + char *funname, *kname; static int substring_member_of_array (); register int c; int key, i; |