aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-16 01:21:42 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-16 01:21:42 +0000
commita2a7ea4834a229da57242c8bc0e14a3fa9fa5a58 (patch)
tree3ba4895137efbc8704a1663193b17465fcc62655 /gcc
parent58a3a26bbdc5f5158b004c761fb054168cd044df (diff)
downloadgcc-a2a7ea4834a229da57242c8bc0e14a3fa9fa5a58.zip
gcc-a2a7ea4834a229da57242c8bc0e14a3fa9fa5a58.tar.gz
gcc-a2a7ea4834a229da57242c8bc0e14a3fa9fa5a58.tar.bz2
runtime: rename siginfo to _siginfo_t
Since the name siginfo winds up in runtime.inc, this avoids a name collision on systems that define "struct siginfo" in the system header files. Reviewed-on: https://go-review.googlesource.com/35239 From-SVN: r244484
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 35c0275..375ce17 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a28b04adaeff8de61c336374db66b24ed96c30f0
+223cba75b947afc1ee5a13a60c15c66f6ff355c1
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.