Module Name: src
Committed By: martin
Date: Mon Dec 18 14:05:23 UTC 2023
Modified Files:
src/lib/libc/stdlib [netbsd-10]: jemalloc.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #501):
lib/libc/stdlib/jemalloc.c: revision 1.64
make malloc_usable_size() visible with old jemalloc.
it's in <malloc.h> and applications like firefox expect it.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.2.1 src/lib/libc/stdlib/jemalloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.55 src/lib/libc/stdlib/jemalloc.c:1.55.2.1
--- src/lib/libc/stdlib/jemalloc.c:1.55 Wed Nov 30 04:35:53 2022
+++ src/lib/libc/stdlib/jemalloc.c Mon Dec 18 14:05:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.55 2022/11/30 04:35:53 skrll Exp $ */
+/* $NetBSD: jemalloc.c,v 1.55.2.1 2023/12/18 14:05:23 martin Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans <[email protected]>.
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
-__RCSID("$NetBSD: jemalloc.c,v 1.55 2022/11/30 04:35:53 skrll Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.55.2.1 2023/12/18 14:05:23 martin Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@@ -157,6 +157,7 @@ __RCSID("$NetBSD: jemalloc.c,v 1.55 2022
#include <string.h>
#include <strings.h>
#include <unistd.h>
+#include <malloc.h>
#ifdef __NetBSD__
# include <reentrant.h>
@@ -3941,7 +3942,6 @@ free(void *ptr)
/*
* Begin non-standard functions.
*/
-#ifndef __NetBSD__
size_t
malloc_usable_size(const void *ptr)
{
@@ -3950,7 +3950,6 @@ malloc_usable_size(const void *ptr)
return (isalloc(ptr));
}
-#endif
/*
* End non-standard functions.
