From: Gregory P. Smith <greg@mad-scientist.com>
Date: Sun, 1 Nov 2009 19:24:18 +0000 (+0000)
Subject: Merged revisions 75999 via svnmerge from
X-Git-Tag: v3.2a1~2257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cafc22f0b82c93f8e905bb78f0b36c6bcdbd3a60;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 75999 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75999 | gregory.p.smith | 2009-10-31 14:23:39 -0700 (Sat, 31 Oct 2009) | 2 lines

  Define TCSASOFT if the flag exists.
........
---

diff --git a/Modules/termios.c b/Modules/termios.c
index 9fccb2e8309b..efdeeaacb28e 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -355,6 +355,9 @@ static struct constant {
 	{"TCSANOW", TCSANOW},
 	{"TCSADRAIN", TCSADRAIN},
 	{"TCSAFLUSH", TCSAFLUSH},
+#ifdef TCSASOFT
+	{"TCSASOFT", TCSASOFT},
+#endif
 
 	/* tcflush() constants */
 	{"TCIFLUSH", TCIFLUSH},