[Python-checkins] CVS: python/dist/src/Modules termios.c,2.16,2.17

Fred L. Drake fdrake@users.sourceforge.net
Thu, 01 Mar 2001 13:54:51 -0800


Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv29170

Modified Files:
	termios.c 
Log Message:

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.


Index: termios.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** termios.c	2001/03/01 03:28:08	2.16
--- termios.c	2001/03/01 21:54:49	2.17
***************
*** 295,298 ****
--- 295,306 ----
  
  
+ #if defined(VSWTCH) && !defined(VSWTC)
+ #define VSWTC VSWTCH
+ #endif
+ 
+ #if defined(VSWTC) && !defined(VSWTCH)
+ #define VSWTCH VSWTC
+ #endif
+ 
  static struct constant {
  	char *name;
***************
*** 321,325 ****
--- 329,335 ----
  	{"B230400", B230400},
  #endif
+ #ifdef CBAUDEX
  	{"CBAUDEX", CBAUDEX},
+ #endif
  
  	/* tcsetattr() constants */
***************
*** 441,444 ****
--- 451,455 ----
  	{"VMIN", VMIN},
  	{"VSWTC", VSWTC},
+ 	{"VSWTCH", VSWTCH},
  	{"VSTART", VSTART},
  	{"VSTOP", VSTOP},