Import of readline 4.3.

[deliverable/binutils-gdb.git] / readline / histlib.h

diff --git a/readline/histlib.h b/readline/histlib.h
index 88a34d10f1d57e22d6a6783a255b11af61d95ce5..c39af71814c81d5c7b73fe43497fc2e77ba7d333 100644 (file)
--- a/readline/histlib.h
+++ b/readline/histlib.h
@@ -22,14 +22,11 @@
 #if !defined (_HISTLIB_H_)
 #define _HISTLIB_H_
 
-/* Function pointers can be declared as (Function *)foo. */
-#if !defined (_FUNCTION_DEF)
-#  define _FUNCTION_DEF
-typedef int Function ();
-typedef void VFunction ();
-typedef char *CPFunction ();
-typedef char **CPPFunction ();
-#endif /* _FUNCTION_DEF */
+#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))
@@ -38,9 +35,6 @@ typedef char **CPPFunction ();
 #endif
 
 #ifndef savestring
-#  ifndef strcpy
-extern char *strcpy ();
-#  endif
 #define savestring(x) strcpy (xmalloc (1 + strlen (x)), (x))
 #endif