Kaydet (Commit) 2b30524e authored tarafından Thomas Wouters's avatar Thomas Wouters

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.
üst b2697005
...@@ -379,7 +379,9 @@ static struct constant { ...@@ -379,7 +379,9 @@ static struct constant {
{"IXON", IXON}, {"IXON", IXON},
{"IXANY", IXANY}, {"IXANY", IXANY},
{"IXOFF", IXOFF}, {"IXOFF", IXOFF},
#ifdef IMAXBEL
{"IMAXBEL", IMAXBEL}, {"IMAXBEL", IMAXBEL},
#endif
/* struct termios.c_oflag constants */ /* struct termios.c_oflag constants */
{"OPOST", OPOST}, {"OPOST", OPOST},
...@@ -505,12 +507,18 @@ static struct constant { ...@@ -505,12 +507,18 @@ static struct constant {
{"ECHOE", ECHOE}, {"ECHOE", ECHOE},
{"ECHOK", ECHOK}, {"ECHOK", ECHOK},
{"ECHONL", ECHONL}, {"ECHONL", ECHONL},
#ifdef ECHOCTL
{"ECHOCTL", ECHOCTL}, {"ECHOCTL", ECHOCTL},
#endif
#ifdef ECHOPRT #ifdef ECHOPRT
{"ECHOPRT", ECHOPRT}, {"ECHOPRT", ECHOPRT},
#endif #endif
#ifdef ECHOKE
{"ECHOKE", ECHOKE}, {"ECHOKE", ECHOKE},
#endif
#ifdef FLUSHO
{"FLUSHO", FLUSHO}, {"FLUSHO", FLUSHO},
#endif
{"NOFLSH", NOFLSH}, {"NOFLSH", NOFLSH},
{"TOSTOP", TOSTOP}, {"TOSTOP", TOSTOP},
#ifdef PENDIN #ifdef PENDIN
...@@ -545,7 +553,9 @@ static struct constant { ...@@ -545,7 +553,9 @@ static struct constant {
#ifdef VWERASE #ifdef VWERASE
{"VWERASE", VWERASE}, {"VWERASE", VWERASE},
#endif #endif
#ifdef VLNEXT
{"VLNEXT", VLNEXT}, {"VLNEXT", VLNEXT},
#endif
{"VEOL2", VEOL2}, {"VEOL2", VEOL2},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment