* argv.c: Include stdlib.h and string.h instead of

        prototyping directly.
        * choose-temp.c: Conditionally include string.h.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index eb9aec2..9248429 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-14  Richard Henderson  <rth@cygnus.com>
+
+       * argv.c: Include stdlib.h and string.h instead of
+       prototyping directly.
+       * choose-temp.c: Conditionally include string.h.
+
 1999-07-11  Ian Lance Taylor  <ian@zembu.com>
 
        * splay-tree.c (splay_tree_insert): Add initialization to avoid

diff --git a/libiberty/argv.c b/libiberty/argv.c
index 85c17e9..f596ffd 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -35,12 +35,8 @@ Boston, MA 02111-1307, USA.  */
 #ifdef __STDC__
 
 #include <stddef.h>
-extern void *memcpy (void *s1, const void *s2, size_t n);      /* 4.11.2.1 */
-extern size_t strlen (const char *s);                          /* 4.11.6.3 */
-extern void *malloc (size_t size);                             /* 4.10.3.3 */
-extern void *realloc (void *ptr, size_t size);                 /* 4.10.3.4 */
-extern void free (void *ptr);                                  /* 4.10.3.2 */
-extern char *strdup (const char *s);                           /* Non-ANSI */
+#include <string.h>
+#include <stdlib.h>
 
 #else  /* !__STDC__ */
 

diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 49c7386..7aae318 100644 (file)
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -34,6 +34,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
 #endif