From nobody Mon Jun 16 17:55:41 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 4bLd2j6SzMz5yCbZ; Mon, 16 Jun 2025 17:55:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLd2j5dQVz3qcx; Mon, 16 Jun 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096541; 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=J88+6pxUzrUfoy/oE0lYows6XDkJ/JxnEWw+kInPYYg=; b=tiU+J5WjZ96Gow2vWlaR4E4ySYksij3YuFFX7EcuMu5hiGa0ILiO7e1aVUMdWjIaTjTuA2 fCCmBDd8tmS1oEVhh0+XiYFJ39tLmnficba44lU/HGmTz3+XntFgHJvOjr1DsULauYoLrZ vQsfF4lj4qn85xrs5RhwrNRCH77PgXTCU4rTv4aGf0rQEWkdr0f0G1+TLGj8r3PVB1Avey ib7sWFVLfabeQEhy4AIRf6lY3u3oGxeEo3In4RfcSD9bi3Qmrfz7kBgSr+s2Rz27gOG08G v9TiqHNbVSXodBnN4Ofo+D21bZRm+Oi1BwXiIKxrgpOeLQ8upSfCRh/suDl2ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096541; 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=J88+6pxUzrUfoy/oE0lYows6XDkJ/JxnEWw+kInPYYg=; b=uPSzz+l4Ay2GTJp0urV7IXE6ke9+/YqCvEpAJ0g646W3ajmsCYbuvUUNxxGQJ+mcoMKXtq 4Se4NYXstejfHX6S8cIs5lF17BMFIGIdaT3JPAC4FdjoBf+01oLiVkfC57A5loCdhzxDH4 9EjV7xA6eP3D52zMaP2a0v5JgqGMrRwL0+rydsuJUvhriZrRJ7fjj8P2eYVlwuMtJF/5Qx T0VcNhaxQ6cK126APFyjjab9ER+fLbmUJEkPWJa5WKVPq6rDL3ikkgGjUrJk6DkcaOUigR k8vadoNS0KjjiID4/MsA+b8Stkgv+KzEJ46kEucEnW2jVCdp6ENtIvKC8EppTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750096541; a=rsa-sha256; cv=none; b=Rp3OsDTXJ7I+LJAG6jE7TR0WXtjghLf4ZMcyiYG/JvjrN8hL26Hnknvfy2HcYBfDHuR0B+ sjYsUbwp8yTFggbXPkiM6cSfxwelq1CR7vPf66SOGfdOnOa2UhbobaemOE5nItZM9gYwOx 6gW4CdehdmoSGlAGTQXBss3FVrnD7JYomsO9tOPnt9hEJlKPuTAKjZKT0DlPmpF7Zs2hvl 3dhAjPKi68PG1dglYkG4Hi7LJi7h3rS7JjI4xj2WQRifwLLpJ3K1U+Ho3c7RTaGX2TMln6 mbpZ2wUIWpS+y7Z7FvqkBJsEdGfZMqYXSlB7oAPyfNLaBOpaPmjwvVCW3FLQ/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bLd2j50K2z17Bv; Mon, 16 Jun 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55GHtfY2059192; Mon, 16 Jun 2025 17:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GHtf4M059189; Mon, 16 Jun 2025 17:55:41 GMT (envelope-from git) Date: Mon, 16 Jun 2025 17:55:41 GMT Message-Id: <202506161755.55GHtf4M059189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a892d594a20b - main - Don't define NULL to nullptr in C++11 mode 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a892d594a20baa851a5850f0b3ae6f4d81c99a08 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a892d594a20baa851a5850f0b3ae6f4d81c99a08 commit a892d594a20baa851a5850f0b3ae6f4d81c99a08 Author: John Baldwin AuthorDate: 2025-06-16 17:54:47 +0000 Commit: John Baldwin CommitDate: 2025-06-16 17:54:47 +0000 Don't define NULL to nullptr in C++11 mode While C++ does seem to permit this, both GCC and clang do not do this in their bundled headers. Instead, both use the __null builtin (and g++ unconditionally overrides NULL back to __null). Our local change makes FreeBSD's C++ environment subtly different from the rest of the world such that code that compiles fine with clang++ on FreeBSD doesn't compile fine on other systems and doesn't compile on FreeBSD using g++. This reverts commit 3033610f5dfd03b68de35631a8693963a80099c2. PR: 286477 (exp-run) Reviewed by: olce, imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D50089 --- sys/sys/_null.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/sys/_null.h b/sys/sys/_null.h index 28a7bd7f6708..f5c4223b9b8c 100644 --- a/sys/sys/_null.h +++ b/sys/sys/_null.h @@ -31,9 +31,7 @@ #if !defined(__cplusplus) #define NULL ((void *)0) #else -#if __cplusplus >= 201103L -#define NULL nullptr -#elif defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 +#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 #define NULL __null #else #if defined(__LP64__)