From ceed4d4ae3f7df17c73bdffa282c0043d047946b Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sun, 5 Jan 2020 13:13:50 +0900 Subject: [PATCH 1/2] fix compile error of connCheck.go --- conncheck.go | 3 ++- conncheck_dummy.go | 2 +- conncheck_test.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conncheck.go b/conncheck.go index 70e9925f6..1d72ffba8 100644 --- a/conncheck.go +++ b/conncheck.go @@ -6,7 +6,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -// +build !windows,!appengine +// +build linux darwin +// +build !appengine package mysql diff --git a/conncheck_dummy.go b/conncheck_dummy.go index 4888288aa..dc8f300e3 100644 --- a/conncheck_dummy.go +++ b/conncheck_dummy.go @@ -6,7 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -// +build windows appengine +// +build !linux,!darwin appengine package mysql diff --git a/conncheck_test.go b/conncheck_test.go index b7234b0f5..df649f2d7 100644 --- a/conncheck_test.go +++ b/conncheck_test.go @@ -6,7 +6,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -// +build go1.10,!windows +// +build linux darwin +// +build !appengine package mysql From 225bd12518b90f6ba22ff7051c27c9834ad2f489 Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sun, 5 Jan 2020 14:06:20 +0900 Subject: [PATCH 2/2] remove "appengine" build tag --- conncheck.go | 1 - conncheck_dummy.go | 2 +- conncheck_test.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conncheck.go b/conncheck.go index 1d72ffba8..3dd115485 100644 --- a/conncheck.go +++ b/conncheck.go @@ -7,7 +7,6 @@ // You can obtain one at http://mozilla.org/MPL/2.0/. // +build linux darwin -// +build !appengine package mysql diff --git a/conncheck_dummy.go b/conncheck_dummy.go index dc8f300e3..d042811c1 100644 --- a/conncheck_dummy.go +++ b/conncheck_dummy.go @@ -6,7 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -// +build !linux,!darwin appengine +// +build !linux,!darwin package mysql diff --git a/conncheck_test.go b/conncheck_test.go index df649f2d7..8cd81223a 100644 --- a/conncheck_test.go +++ b/conncheck_test.go @@ -7,7 +7,6 @@ // You can obtain one at http://mozilla.org/MPL/2.0/. // +build linux darwin -// +build !appengine package mysql