* ppc-dis.c (print_insn_powerpc): Correct condition register display.

[deliverable/binutils-gdb.git] / readline / histsearch.c

diff --git a/readline/histsearch.c b/readline/histsearch.c
index d94fd6cd9c656b1acdf8af91ae59e3529b201f97..8d153b63edd53ac237db0edb52f9f7e2b48bbc69 100644 (file)
--- a/readline/histsearch.c
+++ b/readline/histsearch.c
@@ -32,13 +32,17 @@
 #else
 #  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
-
 #if defined (HAVE_UNISTD_H)
 #  ifdef _MINIX
 #    include <sys/types.h>
 #  endif
 #  include <unistd.h>
 #endif
+#if defined (HAVE_STRING_H)
+#  include <string.h>
+#else
+#  include <strings.h>
+#endif /* !HAVE_STRING_H */
 
 #include "history.h"
 #include "histlib.h"
@@ -47,8 +51,6 @@
    string. */
 char *history_search_delimiter_chars = (char *)NULL;
 
-static int history_search_internal PARAMS((const char *, int, int));
-
 /* Search the history for STRING, starting at history_offset.
    If DIRECTION < 0, then the search is through previous entries, else
    through subsequent.  If ANCHORED is non-zero, the string must
@@ -61,7 +63,7 @@ static int history_search_internal PARAMS((const char *, int, int));
 
 static int
 history_search_internal (string, direction, anchored)
-     const char *string;
+     char *string;
      int direction, anchored;
 {
   register int i, reverse;
@@ -157,7 +159,7 @@ history_search_internal (string, direction, anchored)
 /* Do a non-anchored search for STRING through the history in DIRECTION. */
 int
 history_search (string, direction)
-     const char *string;
+     char *string;
      int direction;
 {
   return (history_search_internal (string, direction, NON_ANCHORED_SEARCH));
@@ -166,7 +168,7 @@ history_search (string, direction)
 /* Do an anchored search for string through the history in DIRECTION. */
 int
 history_search_prefix (string, direction)
-     const char *string;
+     char *string;
      int direction;
 {
   return (history_search_internal (string, direction, ANCHORED_SEARCH));
@@ -177,7 +179,7 @@ history_search_prefix (string, direction)
    which point to begin searching. */
 int
 history_search_pos (string, dir, pos)
-     const char *string;
+     char *string;
      int dir, pos;
 {
   int ret, old;