The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6371645df7b098e3125cce92b3e46f55291ed71c
commit 6371645df7b098e3125cce92b3e46f55291ed71c
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2025-08-15 21:23:33 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2025-08-15 21:24:39 +0000
jemalloc: Add JEMALLOC_PRIVATE_NAMESPACE for the libc namespace
Gate the namespace dance on this define. This allows us to bootstrap new
versions of jemalloc more easily. One of the steps of import is building
to find what symbols need to be private. When we do that, we don't want
to do this dance.
No functional change.
Sponsored by: Netflix
---
contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h | 2 ++
contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in | 2 ++
2 files changed, 4 insertions(+)
diff --git
a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
index a0e4f5af0124..163efbf44248 100644
--- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
+++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
@@ -1,8 +1,10 @@
#ifndef JEMALLOC_INTERNAL_DECLS_H
#define JEMALLOC_INTERNAL_DECLS_H
+#ifndef JEMALLOC_NO_PRIVATE_NAMESPACE
#include "libc_private.h"
#include "namespace.h"
+#endif
#include <math.h>
#ifdef _WIN32
diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
b/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
index 53e30dc4b59b..f821c19746b8 100644
--- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
+++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
@@ -8,8 +8,10 @@
#include <sys/ktrace.h>
#endif
+#ifndef JEMALLOC_PRIVATE_NAMESPACE
#include "un-namespace.h"
#include "libc_private.h"
+#endif
#define JEMALLOC_NO_DEMANGLE
#ifdef JEMALLOC_JET
