summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2016-01-20 19:09:53 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2016-01-20 19:09:53 +0000
commitab8c9d4fda8460537bae9ca358dd6cdcf6fd499e (patch)
treee8cdae2f57747e28be57711a510b814625ce405c /include
parent37375a61bd2c479cf1ecdb6dfa87eb649e03f215 (diff)
After nearly 20 years of warning that malloc.h is obsolete, it's about time we
actually remove this header. It was originally added for ports, which is malloc.h-free now. additional ports bulk by aja@ ok bently@ dcoppa@ millert@ sthen@
Diffstat (limited to 'include')
-rw-r--r--include/Makefile4
-rw-r--r--include/malloc.h6
2 files changed, 2 insertions, 8 deletions
diff --git a/include/Makefile b/include/Makefile
index 43f5b07f523..a2efc56cfae 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.208 2015/11/18 16:48:34 tedu Exp $
+# $OpenBSD: Makefile,v 1.209 2016/01/20 19:09:52 jasper Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
@@ -13,7 +13,7 @@ FILES= a.out.h ar.h asr.h assert.h bitstring.h blf.h bsd_auth.h \
complex.h cpio.h ctype.h curses.h db.h dbm.h dirent.h disktab.h \
dlfcn.h elf_abi.h err.h errno.h fenv.h float.h fnmatch.h fstab.h fts.h \
ftw.h getopt.h glob.h grp.h icdb.h ifaddrs.h inttypes.h iso646.h kvm.h \
- langinfo.h libgen.h limits.h locale.h login_cap.h malloc.h math.h \
+ langinfo.h libgen.h limits.h locale.h login_cap.h math.h \
md5.h memory.h ndbm.h netdb.h netgroup.h nlist.h nl_types.h \
paths.h poll.h pwd.h ranlib.h readpassphrase.h regex.h \
resolv.h rmd160.h search.h setjmp.h sha1.h sha2.h signal.h siphash.h \
diff --git a/include/malloc.h b/include/malloc.h
deleted file mode 100644
index 590c7d8f963..00000000000
--- a/include/malloc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: malloc.h,v 1.2 1996/10/12 03:13:56 tholo Exp $ */
-/* $NetBSD: malloc.h,v 1.3 1994/10/26 00:56:03 cgd Exp $ */
-
-#warning "<malloc.h> is obsolete, use <stdlib.h>"
-
-#include <stdlib.h>