error.c (ss_error): remove const declaration from local variable. (it is

used with free is called on the contents).

ss_internal.h: Include stdlib.h if present on system. If is present,
don't redeclare malloc.

configure.in: Check for stdlib.h before including blindly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5998 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 335018e8d902682e5fdb90e814045bf328554c69..9135d07318acbb517cdc068ddd1f6be150808e97 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun  9 06:20:37 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * error.c (ss_error): remove const declaration from local
+               variable. (it is used with free is called on the contents).
+
+       * ss_internal.h: Include stdlib.h if present on system. If is
+       present, don't redeclare malloc.
+
+       * configure.in: Check for stdlib.h before including blindly.
+
 Thu Jun  8 23:22:07 1995    <tytso@rsx-11.mit.edu>
 
        * list_req.c, ss_internal.h: Clean up -Wall flames.

diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index 4c020419e1a583bce10dc67e328fc6c0198d72c7..e8375d715d6bc0274b5b5580ab54faad9fc450dc 100644 (file)
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -18,7 +18,7 @@ CHECK_WAIT_TYPE
 CHECK_SIGNALS
 CHECK_SIGPROCMASK
 AC_RETSIGTYPE
-AC_CHECK_HEADERS(stdarg.h)
+AC_CHECK_HEADERS(stdarg.h stdlib.h)
 CopySrcHeader(ss.h,$(BUILDTOP)/include/ss)
 CopySrcHeader(mit-sipb-copyright.h,$(BUILDTOP)/include/ss)
 CopyHeader(ss_err.h,$(BUILDTOP)/include/ss)

diff --git a/src/util/ss/error.c b/src/util/ss/error.c
index 2f0f9e5a2c38687540fb0560a2371e13298e2614..0274bce61bccdc7f82ce45caffeb08b28c23e452 100644 (file)
--- a/src/util/ss/error.c
+++ b/src/util/ss/error.c
@@ -69,7 +69,7 @@ void ss_error (va_alist)
     va_dcl
 #endif
 {
-    register char const *whoami;
+    register char *whoami;
     va_list pvar;
 #ifndef HAVE_STDARG_H
     int sci_idx;

diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
index 47c194b8ebce50847e35542402cc77e8d9c32fa5..54046df28618047f5ac1a24a8b15295c5d7a21c8 100644 (file)
--- a/src/util/ss/ss_internal.h
+++ b/src/util/ss/ss_internal.h
@@ -9,7 +9,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #ifdef __STDC__
 
@@ -107,9 +109,11 @@ void ss_page_stdin();
 extern ss_data **_ss_table;
 extern char *ss_et_msgs[];
 
+#ifndef HAVE_STDLIB_H
 extern pointer malloc PROTOTYPE((unsigned));
 extern pointer realloc PROTOTYPE((pointer, unsigned));
 extern pointer calloc PROTOTYPE((unsigned, unsigned));
+#endif
 
 #ifdef USE_SIGPROCMASK
 /* fake sigmask, sigblock, sigsetmask */