Index: stable/12/include/malloc.h
===================================================================
--- stable/12/include/malloc.h	(revision 361500)
+++ stable/12/include/malloc.h	(revision 361501)
@@ -1,6 +1,6 @@
-/* $FreeBSD$ */
-#if __STDC__
-#error "<malloc.h> has been replaced by <stdlib.h>"
-#else
+/*-
+ * This file is in the public domain.
+ * $FreeBSD$
+ */
 #include <stdlib.h>
-#endif
+#include <malloc_np.h>
Index: stable/12
===================================================================
--- stable/12	(revision 361500)
+++ stable/12	(revision 361501)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r360984