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

[Fred L. Drake]

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

Modified Files:
	termios.c 
Log Message:

Add more protection around the VSWTC/VSWTCH, CRTSCTS, and XTABS symbols;
these can be missing on some (all?) Irix and Tru64 versions.

Protect the CRTSCTS value with a cast; this can be a larger value on 
Solaris/SPARC.

This should fix SF tracker items #405092, #405350, and #405355.


Index: termios.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** termios.c	2001/03/01 21:54:49	2.17
--- termios.c	2001/03/02 06:50:58	2.18
***************
*** 392,396 ****
--- 392,398 ----
  	{"TAB2", TAB2},
  	{"TAB3", TAB3},
+ #ifdef XTABS
  	{"XTABS", XTABS},
+ #endif
  	{"BS0", BS0},
  	{"BS1", BS1},
***************
*** 410,415 ****
  #ifdef CIBAUD
  	{"CIBAUD", CIBAUD},
  #endif
- 	{"CRTSCTS", CRTSCTS},
  
  	/* struct termios.c_cflag-related values (character size) */
--- 412,419 ----
  #ifdef CIBAUD
  	{"CIBAUD", CIBAUD},
+ #endif
+ #ifdef CRTSCTS
+ 	{"CRTSCTS", (long)CRTSCTS},
  #endif
  
  	/* struct termios.c_cflag-related values (character size) */
***************
*** 450,455 ****
--- 454,463 ----
  	{"VTIME", VTIME},
  	{"VMIN", VMIN},
+ #ifdef VSWTC
+ 	/* The #defines above ensure that if either is defined, both are,
+          * but both may be omitted by the system headers.  ;-(  */
  	{"VSWTC", VSWTC},
  	{"VSWTCH", VSWTCH},
+ #endif
  	{"VSTART", VSTART},
  	{"VSTOP", VSTOP},