From 5dbd3b804517cab885b93f2626921203c5e48fe4 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 11 Sep 2015 03:12:28 +0000 Subject: [PATCH] libgo/runtime: return 0, not NULL, from main Reviewed-on: https://go-review.googlesource.com/13421 From-SVN: r227673 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 30734893260..6c22440c234 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -9bac6243d2252b2d043243d6ab1123ba7e90fa53 +352617bfe0a880febf5d2a87e89ea439c742ba18 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-main.c b/libgo/runtime/go-main.c index 8e9ceab9f3a..026469b2377 100644 --- a/libgo/runtime/go-main.c +++ b/libgo/runtime/go-main.c @@ -38,7 +38,7 @@ main (int argc, char **argv) runtime_isarchive = false; if (runtime_isstarted) - return NULL; + return 0; runtime_isstarted = true; runtime_check (); -- 2.30.2