From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 24 May 1995 14:12:19 +0000 (+0000)
Subject: ring.c: Include string.h or strings.h
X-Git-Tag: krb5-1.0-beta6~1937
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20c0b46fa0c0d374c94d7a92ad16405053f034a3;p=krb5.git

ring.c: Include string.h or strings.h

configure.in: Check for stdlib.h

 externs.h: Include sys/param.h before redefining BSD
            Include stdlib.h or define malloc, realloc, calloc

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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 6ca8bcddd..18c442f5b 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,12 @@
+Wed May 24 10:00:38 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* ring.c: Include string.h or strings.h
+
+	* configure.in: Check for stdlib.h
+
+	* externs.h: Include sys/param.h before redefining BSD
+	            Include stdlib.h or define malloc, realloc, calloc
+
 Fri Apr 28 18:07:03 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* Makefile.in (KLIB): put KRB4_LIB inside KLIB.
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index 2f2c5eab8..d712e7bbf 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -6,7 +6,7 @@ AC_SET_BUILDTOP
 AC_PROG_INSTALL
 AC_VFORK
 KRB_INCLUDE
-AC_HAVE_HEADERS(unistd.h sys/select.h)
+AC_HAVE_HEADERS(unistd.h sys/select.h stdlib.h)
 AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
 LIBS="$LIBS -ltermcap")
 AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1)
diff --git a/src/appl/telnet/telnet/externs.h b/src/appl/telnet/telnet/externs.h
index ae25e853d..8e66fdf6e 100644
--- a/src/appl/telnet/telnet/externs.h
+++ b/src/appl/telnet/telnet/externs.h
@@ -33,6 +33,8 @@
  *	@(#)externs.h	8.1 (Berkeley) 6/6/93
  */
 
+#include <sys/param.h>
+
 #ifndef	BSD
 # define BSD 43
 #endif
@@ -83,6 +85,13 @@ typedef unsigned char cc_t;
 # endif
 #endif
 
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+extern char *malloc(), *calloc(), *realloc();
+#endif
+
 #ifndef	NO_STRING_H
 #include <string.h>
 #else
diff --git a/src/appl/telnet/telnet/ring.c b/src/appl/telnet/telnet/ring.c
index 93d379e77..59fae9eb8 100644
--- a/src/appl/telnet/telnet/ring.c
+++ b/src/appl/telnet/telnet/ring.c
@@ -60,6 +60,12 @@
 #include	"ring.h"
 #include	"general.h"
 
+#ifndef	NO_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 /* Internal macros */
 
 #if	!defined(MIN)