Imported Upstream version 2011.01.12upstream/2011.01.12

3 files changed, 3 insertions, 3 deletions

diff --git a/src/pkg/syslog/Makefile b/src/pkg/syslog/Makefile
index f05d4aef4..cf6863c87 100644
--- a/src/pkg/syslog/Makefile
+++ b/src/pkg/syslog/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.$(GOARCH)
+include ../../Make.inc
 
 TARG=syslog
 GOFILES=\
diff --git a/src/pkg/syslog/syslog.go b/src/pkg/syslog/syslog.go
index 527321f57..4924a76d0 100644
--- a/src/pkg/syslog/syslog.go
+++ b/src/pkg/syslog/syslog.go
@@ -140,5 +140,5 @@ func NewLogger(p Priority, flag int) *log.Logger {
 	if err != nil {
 		return nil
 	}
-	return log.New(s, nil, "", flag)
+	return log.New(s, "", flag)
 }
diff --git a/src/pkg/syslog/syslog_test.go b/src/pkg/syslog/syslog_test.go
index 7fc90678c..063ab71b4 100644
--- a/src/pkg/syslog/syslog_test.go
+++ b/src/pkg/syslog/syslog_test.go
@@ -47,7 +47,7 @@ func TestNew(t *testing.T) {
 func TestNewLogger(t *testing.T) {
 	f := NewLogger(LOG_INFO, 0)
 	if f == nil {
-		t.Errorf("NewLogger() failed\n")
+		t.Error("NewLogger() failed")
 	}
 }