From nobody Fri Nov 28 15:57:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dHycY5H18z6HkSt for ; Fri, 28 Nov 2025 15:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHycY4hMbz4F0M for ; Fri, 28 Nov 2025 15:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764345469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GFRgQcYyT6LbFwPfh/y4fHHjftpHv/lcWmZFuTw+CzI=; b=Z/3myxjcKKUNP8nnAmXg+DqN/+KSouqXs7SjEtAaZtCSlsN+QcAArtsH75hmqVqkHKo2WA Y8p3ojLVB+LHqjSEpkfh0RG3v91Z/e56NA/2DwyGaSKbgMXzGjK99ClY91IBx9JwXR6JVE OrluVUb9ezjqCS6vWl0jna0iPRQabXFvexILuwQeZkWYTiF3SYDcmr2ZeBz6eCDSv+1nnC brX3Ja3/FBN1k0gzOUcFcv89hzurS9Ineao6QmG+hf5MCNFJV1HPl4Nfgb20qaXUyvszWp 1RLK23NRSYy4w0AeD1WYO5+ogjY/GupHqJV9aiFze92R+qJcluan9d2dm4mLdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764345469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GFRgQcYyT6LbFwPfh/y4fHHjftpHv/lcWmZFuTw+CzI=; b=Qkj+XB4GZtVkZniXb31w7s9g3IGHCYFIhXA2dkYTTsOBTb5ZARJ1IjnpZT1V51g+lelIvp 9OvbgvoPwVngXRWzTZh9woUssM4sh/5z6pMc7d1luREv9t2S4zh98yEHCUADNWx6yTjYvh MUWdX81rlnJQ5sUnSPLj2YohLLyaU4WCixM5G0IRxQToy4PNCOCCkkc3RvFAjVa+FfgpX+ ZnC8EiCKqmjxARWEzJQcVnQ7vxnDR/JA2bW8CmwkITRs+jOqflAHsV+uPbMqPOR3rRFnxo L3Ev/QMRBJ7RuP8y/2x+62lL4qbvvFOCuVkjVCvcVhQn2Y8INw+NUjjZmpO6Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764345469; a=rsa-sha256; cv=none; b=veaGD4wCg58Pdq+Vc7p4vHLfCgeiuM6vHaQxz2a3CzZwbfZ/g97Qf62hhMLclH5dFhUEPC lDxv3aD4RpFg7z3o6hnJ4xcbWrjLphK8KXwAya9QeUHn6C2rZHKtN3fmn69xdU0XJd2lPZ K9AMjPFoBqdpVU9Thl+Y2LwQWSb88ls5vEsBv64Px2EwzDIDZY3GKN2sFdToES4O6pPiy+ dbjekk++wJ4OfCHP9+Jw+QyhofgmoeCYcgXBZ+QV9AGNFgO53VR/DtAPOz/4aQyEPydDgj r3SIANe+zIwxE7mHmZ6cz3iH3/Pmn87zjYNDscq7akk9Vzx097pp/69ZB4jKtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dHycY3sWnz17p6 for ; Fri, 28 Nov 2025 15:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 15:57:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 04d000a378b0 - main - jemalloc: avoid clash with C23 unreachable() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04d000a378b04bca1aff4a1cc3d74f5c9c5368b9 Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 15:57:49 +0000 Message-Id: <6929c67d.313b8.42f274c8@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=04d000a378b04bca1aff4a1cc3d74f5c9c5368b9 commit 04d000a378b04bca1aff4a1cc3d74f5c9c5368b9 Author: Robert Clausecker AuthorDate: 2025-11-27 21:59:12 +0000 Commit: Robert Clausecker CommitDate: 2025-11-28 15:55:05 +0000 jemalloc: avoid clash with C23 unreachable() macro Summary: This avoids a clash with the new macro in introduced in D53967 Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53968 --- contrib/jemalloc/include/jemalloc/internal/util.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/jemalloc/include/jemalloc/internal/util.h b/contrib/jemalloc/include/jemalloc/internal/util.h index dcb1c0a5d62b..da84b09d0132 100644 --- a/contrib/jemalloc/include/jemalloc/internal/util.h +++ b/contrib/jemalloc/include/jemalloc/internal/util.h @@ -40,6 +40,9 @@ # error JEMALLOC_INTERNAL_UNREACHABLE should have been defined by configure #endif +#ifdef unreachable +# undef unreachable +#endif #define unreachable() JEMALLOC_INTERNAL_UNREACHABLE() /* Set error code. */