Don't declare calloc() and realloc() if not necessary.

diff --git a/acconfig.h b/acconfig.h
index fd8cc099b3f586e0c4316b658cb1e0770181822d..ccbb40c842764212d0fe77cbbe3d345b4578fe3f 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -31,6 +31,14 @@
 
 /* The location of the semantic parser (bison.hairy).  */
 #undef XPFILE1
 
 /* The location of the semantic parser (bison.hairy).  */
 #undef XPFILE1

+
+/* Define as 1 if realloc must be declared even if <stdlib.h> is
+   included.  */
+#undef NEED_DECLARATION_REALLOC
+
+/* Define as 1 if calloc must be declared even if <stdlib.h> is
+   included.  */
+#undef NEED_DECLARATION_CALLOC

 @BOTTOM@
 
 #if defined(PROTOTYPES) || defined(__cplusplus)
 @BOTTOM@
 
 #if defined(PROTOTYPES) || defined(__cplusplus)

diff --git a/acinclude.m4 b/acinclude.m4
index 6d72b703cf3d67f87be53d8c714b9fd6d06bc356..8c909d2b9161f4f9e24dbc6bceffa08b5eba9225 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -11,3 +11,50 @@ AC_DEFUN(BISON_DEFINE_FILE, [
         )`
         AC_DEFINE_UNQUOTED($1, "$ac_expanded")
 ])
         )`
         AC_DEFINE_UNQUOTED($1, "$ac_expanded")
 ])

+
+dnl See whether we need a declaration for a function.
+dnl BISON_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
+AC_DEFUN(BISON_NEED_DECLARATION,
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_CACHE_VAL(bison_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifndef HAVE_RINDEX
+#define rindex strrchr
+#endif
+#ifndef HAVE_INDEX
+#define index strchr
+#endif
+$2],
+[char *(*pfn) = (char *(*)) $1],
+eval "bison_cv_decl_needed_$1=no", eval "bison_cv_decl_needed_$1=yes")])
+if eval "test \"`echo '$bison_cv_decl_needed_'$1`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  bison_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  AC_DEFINE_UNQUOTED($bison_tr_decl)
+else
+  AC_MSG_RESULT(no)
+fi
+])dnl
+
+dnl Check multiple functions to see whether each needs a declaration.
+dnl BISON_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
+AC_DEFUN(BISON_NEED_DECLARATIONS,
+[for ac_func in $1
+do
+BISON_NEED_DECLARATION($ac_func, $2)
+done
+])

diff --git a/configure.in b/configure.in
index ab54e81ede2d9032f928c1a5c100dec1ca903fe1..2cd7d67609b3ab8a297941de0ee0cf8a31cc54a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,6 +31,7 @@ AM_C_PROTOTYPES
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(mkstemp setlocale)
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(mkstemp setlocale)

+BISON_NEED_DECLARATIONS(calloc realloc)

 
 AM_GNU_GETTEXT
 
 
 AM_GNU_GETTEXT
 

diff --git a/src/allocate.c b/src/allocate.c
index 1175e791027b0203aa900979bd96ee1d562ccef2..fdc83856fdc9b23406e8a3c1775a3ed961cdc5f8 100644 (file)
--- a/src/allocate.c
+++ b/src/allocate.c
@@ -22,13 +22,21 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include "system.h"
 
 #include <stdio.h>
 #include "system.h"
 

+#ifdef NEED_DECLARATION_CALLOC

 #if defined (__STDC__) || defined (_MSC_VER)
 extern void *calloc ();
 #if defined (__STDC__) || defined (_MSC_VER)
 extern void *calloc ();

-extern void *realloc ();

 #else
 extern char *calloc ();
 #else
 extern char *calloc ();

+#endif
+#endif  /* NEED_DECLARATION_CALLOC */
+
+#ifdef NEED_DECLARATION_REALLOC
+#if defined (__STDC__) || defined (_MSC_VER)
+extern void *realloc ();
+#else

 extern char *realloc ();
 #endif
 extern char *realloc ();
 #endif

+#endif  /* NEED_DECLARATION_REALLOC */

 
 char *xmalloc PARAMS((register unsigned));
 char *xrealloc PARAMS((register char *, register unsigned));
 
 char *xmalloc PARAMS((register unsigned));
 char *xrealloc PARAMS((register char *, register unsigned));