From: Fred Drake <fdrake@acm.org>
Date: Thu, 1 Mar 2001 21:54:49 +0000 (+0000)
Subject: Solaris defines VSWTCH instead of VSWTC; carefully make sure both are
X-Git-Tag: v2.1b1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ef7fa875a381e7ea8b6253d221d5f15052c8e06;p=thirdparty%2FPython%2Fcpython.git

Solaris defines VSWTCH instead of VSWTC; carefully make sure both are
defined and export both names.

Solaris also does not define CBAUDEX; it is not clear that CBAUDEXT
(which is defined there) is the same thing, so we only protect against
the lack of CBAUDEX.

Reported by Greg V. Wilson.
---

diff --git a/Modules/termios.c b/Modules/termios.c
index 4ec0a36c95b6..16a6d38596f3 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -294,6 +294,14 @@ static PyMethodDef termios_methods[] =
 };
 
 
+#if defined(VSWTCH) && !defined(VSWTC)
+#define VSWTC VSWTCH
+#endif
+
+#if defined(VSWTC) && !defined(VSWTCH)
+#define VSWTCH VSWTC
+#endif
+
 static struct constant {
 	char *name;
 	long value;
@@ -320,7 +328,9 @@ static struct constant {
 #ifdef B230400
 	{"B230400", B230400},
 #endif
+#ifdef CBAUDEX
 	{"CBAUDEX", CBAUDEX},
+#endif
 
 	/* tcsetattr() constants */
 	{"TCSANOW", TCSANOW},
@@ -440,6 +450,7 @@ static struct constant {
 	{"VTIME", VTIME},
 	{"VMIN", VMIN},
 	{"VSWTC", VSWTC},
+	{"VSWTCH", VSWTCH},
 	{"VSTART", VSTART},
 	{"VSTOP", VSTOP},
 	{"VSUSP", VSUSP},