# HG changeset patch # User Gerd Moellmann # Date 967923325 0 # Node ID 3ecef4a7b3cd7dcafaa14fe601a4de50ffd402e5 # Parent 9c011adf9309be4bbc9be4e21e884c56d3c5bc5a Remove includes of string.h and strings.h. (index) [HAVE_INDEX]: Add prototype. diff -r 9c011adf9309 -r 3ecef4a7b3cd src/callint.c --- a/src/callint.c Sat Sep 02 17:58:27 2000 +0000 +++ b/src/callint.c Sat Sep 02 19:35:25 2000 +0000 @@ -27,12 +27,8 @@ #include "window.h" #include "mocklisp.h" -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include +#ifdef HAVE_INDEX +extern char *index P_ ((const char *, int)); #endif extern Lisp_Object Qcursor_in_echo_area; diff -r 9c011adf9309 -r 3ecef4a7b3cd src/doc.c --- a/src/doc.c Sat Sep 02 17:58:27 2000 +0000 +++ b/src/doc.c Sat Sep 02 19:35:25 2000 +0000 @@ -41,12 +41,8 @@ #include "keyboard.h" #include "charset.h" -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include +#ifdef HAVE_INDEX +extern char *index P_ ((const char *, int)); #endif Lisp_Object Vdoc_file_name, Vhelp_manyarg_func_alist; diff -r 9c011adf9309 -r 3ecef4a7b3cd src/editfns.c --- a/src/editfns.c Sat Sep 02 17:58:27 2000 +0000 +++ b/src/editfns.c Sat Sep 02 19:35:25 2000 +0000 @@ -42,14 +42,6 @@ #include "systime.h" -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif - #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -79,6 +71,10 @@ static Lisp_Object subst_char_in_region_unwind_1 P_ ((Lisp_Object)); static void transpose_markers P_ ((int, int, int, int, int, int, int, int)); +#ifdef HAVE_INDEX +extern char *index P_ ((const char *, int)); +#endif + Lisp_Object Vbuffer_access_fontify_functions; Lisp_Object Qbuffer_access_fontify_functions; Lisp_Object Vbuffer_access_fontified_property; diff -r 9c011adf9309 -r 3ecef4a7b3cd src/emacs.c --- a/src/emacs.c Sat Sep 02 17:58:27 2000 +0000 +++ b/src/emacs.c Sat Sep 02 19:35:25 2000 +0000 @@ -60,14 +60,6 @@ #include #endif -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif - #ifndef O_RDWR #define O_RDWR 2 #endif @@ -81,6 +73,9 @@ extern void malloc_warning P_ ((char *)); extern void set_time_zone_rule P_ ((char *)); +#ifdef HAVE_INDEX +extern char *index P_ ((const char *, int)); +#endif /* Make these values available in GDB, which doesn't see macros. */