Merge branch 'master' of github.com:dotcloud/docker

Upstream-commit: 9906a9af8f2f66dfd630c219936e0a27b9754e56
Component: engine

components/engine/docker/docker.go

@@ -21,10 +21,6 @@ type Termios struct {
 	Ospeed uintptr
 }
 
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
 
 const (
 	// Input flags

components/engine/docker/termios_darwin.go

@@ -0,0 +1,8 @@
+package main
+
+import "syscall"
+
+const (
+	getTermios = syscall.TCIOGETA
+	setTermios = syscall.TCIOSETA
+)

components/engine/docker/termios_linux.go

@@ -0,0 +1,8 @@
+package main
+
+import "syscall"
+
+const (
+	getTermios = syscall.TCGETS
+	setTermios = syscall.TCSETS
+)