Remove includes of

string.h and strings.h.
(index) [HAVE_INDEX]: Add prototype.

5 files changed, 15 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ff6af32b1c6..09108b858f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-02  Gerd Moellmann  <gerd@gnu.org>
 
+        * emacs.c, callint.c, doc.c, editfns.c: Remove includes of
+        string.h and strings.h.
+        (index) [HAVE_INDEX]: Add prototype.
+
         * unexelf.c (SHT_PROGBITS) [__NetBSD__ && !PT_LOAD]: Don't define.
         (SHT_MIPS_DEBUG, HDRR) [__NetBSD__ && __mips__]: Define.
 
diff --git a/src/callint.c b/src/callint.c
index 88743b83980..5289bfa3853 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -27,12 +27,8 @@ Boston, MA 02111-1307, USA.  */
 #include "window.h"
 #include "mocklisp.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
+#ifdef HAVE_INDEX
+extern char *index P_ ((const char *, int));
 #endif
 
 extern Lisp_Object Qcursor_in_echo_area;
diff --git a/src/doc.c b/src/doc.c
index 52545c1f3fc..ee0a28d1621 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -41,12 +41,8 @@ Boston, MA 02111-1307, USA.  */
 #include "keyboard.h"
 #include "charset.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
+#ifdef HAVE_INDEX
+extern char *index P_ ((const char *, int));
 #endif
 
 Lisp_Object Vdoc_file_name, Vhelp_manyarg_func_alist;
diff --git a/src/editfns.c b/src/editfns.c
index c8011c8eb3e..7b5264385a2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -42,14 +42,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "systime.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#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 P_ ((Lisp_Object));
 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 --git a/src/emacs.c b/src/emacs.c
index e91fca2eb01..ef28352d3d4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -60,14 +60,6 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
 #ifndef O_RDWR
 #define O_RDWR 2
 #endif
@@ -81,6 +73,9 @@ Boston, MA 02111-1307, USA.  */
 
 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.  */