From 04b4a5e4866daa7b6f4a4a3e7ed1a23f7787841d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 18 Oct 2024 19:51:00 -0700 Subject: runtime/testdata: fix for C23 nullptr keyword Backport https://go.dev/cl/620955 from main repo. Original description: src/runtime/testdata/testprogcgo/threadprof.go contains C code with a variable called nullptr. This conflicts with the nullptr keyword in the C23 revision of the C standard (showing up as gccgo test build failures when updating GCC to use C23 by default when building C code). Rename that variable to nullpointer to avoid the clash with the keyword (any other name that's not a keyword would work just as well). Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/621059 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/go') diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3a83941..c39aca9 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -6aa463fef2d8f04e0bd2675f63a6529df080a44a +092668d6ce6d7b3aff6797247cd53dc44319c558 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. -- cgit v1.1