Forward-port revision 2.24.2.4 from the release21-maint branch:

Protect several more uses of constants with #ifdefs; these are necessary on
(at least) SCO OpenServer 5. Fixes a non-SF-submitted bugreport by Michael
Kent.

diff --git a/Modules/termios.c b/Modules/termios.c
index 54d72b2fb62a36f56368242acbe8b32aab432166..c77dff36ad79e715380922ab3ce7177bec50815a 100644 (file)
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -379,7 +379,9 @@ static struct constant {
        {"IXON", IXON},
        {"IXANY", IXANY},
        {"IXOFF", IXOFF},
+#ifdef IMAXBEL
        {"IMAXBEL", IMAXBEL},
+#endif
 
        /* struct termios.c_oflag constants */
        {"OPOST", OPOST},
@@ -505,12 +507,18 @@ static struct constant {
        {"ECHOE", ECHOE},
        {"ECHOK", ECHOK},
        {"ECHONL", ECHONL},
+#ifdef ECHOCTL
        {"ECHOCTL", ECHOCTL},
+#endif
 #ifdef ECHOPRT
        {"ECHOPRT", ECHOPRT},
 #endif
+#ifdef ECHOKE
        {"ECHOKE", ECHOKE},
+#endif
+#ifdef FLUSHO
        {"FLUSHO", FLUSHO},
+#endif
        {"NOFLSH", NOFLSH},
        {"TOSTOP", TOSTOP},
 #ifdef PENDIN
@@ -545,7 +553,9 @@ static struct constant {
 #ifdef VWERASE
        {"VWERASE", VWERASE},
 #endif
+#ifdef VLNEXT
        {"VLNEXT", VLNEXT},
+#endif
        {"VEOL2", VEOL2},