From bbbed78aaa9ad2d55ed30c15707e7efce92b80d1 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 12 May 2020 18:17:57 +0000 Subject: [PATCH] Make include/malloc.h usable again. Lot of third-party Linux code uses #include , expecting to find the malloc extensions there. Instead of trying to fight them, accept that attempt to deprecate the header causes more troubles than solves potential portability issues, and provide our jemalloc extensions. PR: 155429 Reviewed by: imp, jhibbits, dab, hselasky, philip, emaste, jilles Exp-run by: antoine (PR 245366) Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D24297 --- include/malloc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/malloc.h b/include/malloc.h index 5d7d7e8396d..75673c72ed8 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,6 +1,6 @@ -/* $FreeBSD$ */ -#if __STDC__ -#error " has been replaced by " -#else +/*- + * This file is in the public domain. + * $FreeBSD$ + */ #include -#endif +#include