From 2493af8e3bc76234993370d82120c7e15ed4c95b Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 8 Jan 2018 10:21:31 +0100 Subject: [PATCH] plan9: move Unsetenv into env_plan9.go Unsetenv was in its own file for Go 1.4 compatibility. This version is no longer supported, so move Unsetenv with the other environment specific functions. Change-Id: I8b6621993f2ab0fbafe900b19dcaee7b5b3ed26f Reviewed-on: https://go-review.googlesource.com/86540 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- plan9/env_plan9.go | 4 ++++ plan9/env_unset.go | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 plan9/env_unset.go diff --git a/plan9/env_plan9.go b/plan9/env_plan9.go index 7ef9b187..8f191800 100644 --- a/plan9/env_plan9.go +++ b/plan9/env_plan9.go @@ -25,3 +25,7 @@ func Clearenv() { func Environ() []string { return syscall.Environ() } + +func Unsetenv(key string) error { + return syscall.Unsetenv(key) +} diff --git a/plan9/env_unset.go b/plan9/env_unset.go deleted file mode 100644 index ce4ab25c..00000000 --- a/plan9/env_unset.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build go1.4 - -package plan9 - -import "syscall" - -func Unsetenv(key string) error { - // This was added in Go 1.4. - return syscall.Unsetenv(key) -}