Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jun 2026 10:11:17 +0000
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Faraz Vahedi <kfv@kfv.io>
Subject:   git: 54dab51ee8fb - stable/15 - libc: Restrict the static_assert macro to pre-C23 modes
Message-ID:  <6a4244c5.3764b.286abb46@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by fuz:

URL: https://cgit.FreeBSD.org/src/commit/?id=54dab51ee8fb8e3c6d36117272c5f7fc6c7f0874

commit 54dab51ee8fb8e3c6d36117272c5f7fc6c7f0874
Author:     Faraz Vahedi <kfv@kfv.io>
AuthorDate: 2026-05-17 20:47:49 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-06-29 08:23:02 +0000

    libc: Restrict the static_assert macro to pre-C23 modes
    
    Signed-off-by:  Faraz Vahedi <kfv@kfv.io>
    Reviewed by:    fuz
    MFC after:      1 month
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/2203
    
    (cherry picked from commit c5c7d18d011830088a2134e1be32f610f1f3e797)
---
 include/assert.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/assert.h b/include/assert.h
index a3dbe933e18f..a089d7b79915 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -72,8 +72,11 @@
  * C++ template parameters may contain commas, even if not enclosed in
  * parentheses, causing the _Static_assert macro to be invoked with more
  * than two parameters.
+ *
+ * C23 defines static_assert and its obsolescent alternative spelling,
+ * _Static_assert, as keywords.
  */
-#if __ISO_C_VISIBLE >= 2011 && !defined(__cplusplus)
+#if __ISO_C_VISIBLE >= 2011 && __ISO_C_VISIBLE < 2023 && !defined(__cplusplus)
 #define	static_assert	_Static_assert
 #endif
 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a4244c5.3764b.286abb46>