summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1994-06-16 06:20:47 +0000
committerMark Eichin <eichin@mit.edu>1994-06-16 06:20:47 +0000
commite5a64c624d6bbdf3598f55742dffec17717f53a7 (patch)
tree3518a61f32776d374b0cc025f148084c99bd576c /src
parentde2def41152ce767eabdbca801207438eb3b234d (diff)
downloadkrb5-e5a64c624d6bbdf3598f55742dffec17717f53a7.tar.gz
krb5-e5a64c624d6bbdf3598f55742dffec17717f53a7.tar.xz
krb5-e5a64c624d6bbdf3598f55742dffec17717f53a7.zip
cleaner malloc handling
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3847 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/isode/h/general.h31
1 files changed, 8 insertions, 23 deletions
diff --git a/src/isode/h/general.h b/src/isode/h/general.h
index feaa247f4..94233fa5e 100644
--- a/src/isode/h/general.h
+++ b/src/isode/h/general.h
@@ -3,24 +3,6 @@
/*
* $Header$
*
- *
- * $Log$
- * Revision 1.1 1994/06/10 03:29:17 eichin
- * autoconfed isode for kerberos work
- *
- * Revision 1.1 94/06/10 03:17:42 eichin
- * autoconfed isode for kerberos work
- *
- * Revision 1.3 1994/06/07 23:08:23 eichin
- * hide calloc/malloc/realloc from ultrix too
- *
- * Revision 1.1 1994/05/31 20:37:55 eichin
- * reduced-isode release from /mit/isode/isode-subset/src
- *
- * Revision 8.0 91/07/17 12:33:44 isode
- * Release 7.0
- *
- *
*/
/*
@@ -161,14 +143,17 @@ char *mktemp ();
#endif /* SVR4 */
#ifdef __STDC__
-#include <malloc.h>
+#include <stdlib.h>
+#else
+/* ultrix cc isn't STD but has stdlib.h, with malloc... */
+#ifdef mips
+#include <stdlib.h>
#else
#ifndef _AIX
-#ifndef mips
char *calloc (), *malloc (), *realloc ();
-#endif
-#endif
-#endif
+#endif /* _AIX */
+#endif /* mips */
+#endif /* __STDC__ */
#ifndef BSDSTRS