ChangeLogTag: Sun Oct 16 17:17:50 2005 Olli Savia <ops@iki.fi>

33 files changed, 96 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index 17e4d78932b..5944e3e6936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+Sun Oct 16 17:17:50 2005  Olli Savia  <ops@iki.fi>
+
+        * ace/OS.h:
+        * ace/config-cray.h:
+        * ace/config-cygwin32.h:
+        * ace/config-dgux-4.11-epc.h:
+        * ace/config-dgux-4.x-ghs.h:
+        * ace/config-freebsd.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-irix6.x-common.h:
+        * ace/config-linux-common.h:
+        * ace/config-lynxos.h:
+        * ace/config-m88k.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+        * ace/config-openbsd.h:
+        * ace/config-qnx-neutrino.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-qnx-rtp-pre62x.h:
+        * ace/config-rtems.h:
+        * ace/config-sco-5.0.0-mit-pthread.h:
+        * ace/config-sco-5.0.0.h:
+        * ace/config-sunos5.4-centerline-2.x.h:
+        * ace/config-sunos5.4-g++.h:
+        * ace/config-sunos5.4-sunc++-4.x.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-tandem.h:
+        * ace/config-unixware-2.01-g++.h:
+        * ace/config-unixware-2.1.2-g++.h:
+        * ace/config-unixware-7.1.0.h:
+        * ace/config-unixware-7.1.0.udk.h:
+        * ace/config-win32-interix.h:
+          Replaced old TTY_IO related macros with the new
+          ACE_HAS_TERMIOS macro.
+
+        * ace/TTY_IO.cpp:
+          Added include "ace/config-lite.h" to pull feature macro
+          definitions.
+
 Sun Oct 16 16:14:48 2005  Olli Savia  <ops@iki.fi>
 
         * ace/README:
diff --git a/ace/OS.h b/ace/OS.h
index 98054918dab..66f43169957 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -294,9 +294,9 @@ class ACE_Timeout_Manager;
 #     include "ace/os_include/os_strings.h"
 #   endif /* ACE_HAS_STRINGS */
 
-#   if defined (ACE_HAS_TERM_IOCTLS)
+#   if defined (ACE_HAS_TERMIOS)
 #     include "ace/os_include/os_termios.h"
-#   endif /* ACE_HAS_TERM_IOCTLS */
+#   endif /* ACE_HAS_TERMIOS */
 
 #   if defined (ACE_HAS_AIO_CALLS)
 #     include "ace/os_include/os_aio.h"
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index 9b160fba4f1..2c9837554fd 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/config-lite.h"
 #if defined (ACE_HAS_TERMIOS)
 # include "ace/os_include/os_termios.h"
 #elif  defined (ACE_HAS_TERMIO)
diff --git a/ace/config-cray.h b/ace/config-cray.h
index 6f25425e64e..e4c18486f09 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -86,7 +86,8 @@
 
 #define ACE_HAS_POSIX_NONBLOCK
 
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #define ACE_HAS_DIRENT
 
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index 7ed1c40c6d6..db16c7e3d6c 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -99,7 +99,8 @@
 
 #define ACE_HAS_BIG_FD_SET
 
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535
 
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 1168f6d03a7..a12225b5dc6 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -37,8 +37,8 @@
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 41e1bd527cf..ae662587d6b 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -40,8 +40,8 @@
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 //#define ACE_HAS_REENTRANT_FUNCTIONS
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index e71f9626525..f0e92a55340 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -224,10 +224,8 @@ extern "C" { char * cuserid (char *s); }
 
 #define ACE_HAS_SIGWAIT
 
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_HAS_NEW_TERMIOS_STRUCT
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #if (__FreeBSD_version > 400000)
 #define ACE_HAS_UCONTEXT_T
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 3757519630e..7b793dd8c16 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -488,7 +488,9 @@
 #endif /* ACE_HAS_THREADS */
 
 #define ACE_HAS_POSIX_SEM
-#define ACE_HAS_TERM_IOCTLS
+
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h
index 3c38fd89562..c42bc6f83f2 100644
--- a/ace/config-irix6.x-common.h
+++ b/ace/config-irix6.x-common.h
@@ -183,8 +183,8 @@
 #define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 #define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2
 
-// Enables use of POSIX termios struct
-#define ACE_HAS_NEW_TERMIOS_STRUCT
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // IRIX 6.5 supports AIO
 #define ACE_HAS_AIO_CALLS
@@ -213,9 +213,6 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
-
 // Platform does not support reentrant password file accessor functiions.
 #define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
 
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index b546a9b8b0d..e24c396a0c3 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -298,8 +298,6 @@
 // (see NOTES in Linux's select(2) man page).
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 
-#define ACE_HAS_TERM_IOCTLS
-
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535
 
 #define ACE_HAS_GETPAGESIZE 1
@@ -383,8 +381,8 @@
 #define ACE_LACKS_GETIPNODEBYADDR
 #define ACE_LACKS_GETIPNODEBYNAME
 
-// Enables use of POSIX termios struct
-#define ACE_HAS_NEW_TERMIOS_STRUCT
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
 
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index e1cfa0ed228..0b0b814abc4 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -81,7 +81,7 @@
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_SIGLIST
 #define ACE_HAS_SYS_SOCKIO_H
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_LACKS_CONST_TIMESPEC_PTR
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 64c4ae8e298..8409f53cd3b 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -91,8 +91,8 @@ struct ip_mreq
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #endif  /* ACE_HAS_FSU_PTHREADS */
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h
index ea065b2639d..cb60ac49b95 100644
--- a/ace/config-macosx-panther.h
+++ b/ace/config-macosx-panther.h
@@ -160,9 +160,8 @@
 #define ACE_LACKS_SETSCHED
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
-#define ACE_HAS_TERM_IOCTLS
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-macosx-tiger.h b/ace/config-macosx-tiger.h
index 868e92e2257..390d964df9f 100644
--- a/ace/config-macosx-tiger.h
+++ b/ace/config-macosx-tiger.h
@@ -171,10 +171,8 @@
 #define ACE_LACKS_SETSCHED
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_HAS_NEW_TERMIOS_STRUCT
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 93f905e990a..983eccebb1b 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -161,9 +161,8 @@
 #define ACE_LACKS_SETSCHED
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
-#define ACE_HAS_TERM_IOCTLS
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h
index eacb2129ff6..37c066f3382 100644
--- a/ace/config-openbsd.h
+++ b/ace/config-openbsd.h
@@ -221,10 +221,8 @@
 
 #endif /* ! ACE_HAD_THREADS */
 
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_HAS_NEW_TERMIOS_STRUCT
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // OpenBSD actually has the clearerr call, but it causes a
 // bogus compiler syntax error.
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index a1549f63c16..d041a02cf20 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -90,7 +90,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_GETTIMEOFDAY
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
diff --git a/ace/config-qnx-rtp-62x.h b/ace/config-qnx-rtp-62x.h
index 6d196b03d87..49f31b6cda1 100644
--- a/ace/config-qnx-rtp-62x.h
+++ b/ace/config-qnx-rtp-62x.h
@@ -59,7 +59,7 @@
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_GETTIMEOFDAY
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
diff --git a/ace/config-qnx-rtp-pre62x.h b/ace/config-qnx-rtp-pre62x.h
index 17fd0979f1a..0d3a64cd7f8 100644
--- a/ace/config-qnx-rtp-pre62x.h
+++ b/ace/config-qnx-rtp-pre62x.h
@@ -58,7 +58,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_GETTIMEOFDAY
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index 2cbb47fb4cd..5ec4d571a4e 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -141,7 +141,7 @@ ACE_HAS_SOCKADDR_MSG_NAME
 ACE_HAS_SOCKLEN_T
 ACE_HAS_STRBUF_T
 ACE_HAS_SYS_SIGLIST
-ACE_HAS_TERM_IOCTLS
+ACE_HAS_TERMIOS
 ACE_HAS_THREAD_SAFE_ACCEPT
 ACE_LACKS_COND_TIMEDWAIT_RESET
 ACE_LACKS_MSG_ACCRIGHTS
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index 7380b699e20..c938cf165cb 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -51,8 +51,8 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
-// Platform supports Term Ioctls
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 1820a96f3ca..34687bfb369 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -35,8 +35,8 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
-// Platform supports Term Ioctls
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Compiler/platform contains the <sys/syscall.h> file.
 //#define ACE_HAS_SYS_SYSCALL_H
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 9d827efe50a..2aa9e407c43 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -38,8 +38,8 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 4a75f7feb77..8530ebdecde 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -26,7 +26,8 @@
 
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS 
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index ea80d7c51c1..882307aab64 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -43,8 +43,8 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index b2261bcbadb..7dbd005d6cf 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -171,8 +171,8 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index b03893e478c..c74cf133d1e 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -54,8 +54,8 @@
 //Platform provides <sysent.h> header
 #define ACE_HAS_SYSENT_H
 
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
+// Platform has POSIX terminal interface.
+#define ACE_HAS_TERMIOS
 
 //Platform supports POSIX O_NONBLOCK semantics
 #define ACE_HAS_POSIX_NONBLOCK
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index fcc5bdb6d71..c476b9784d5 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -59,7 +59,7 @@
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H
 #define ACE_HAS_SYS_SIGLIST
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_TIMOD_H
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index ce49a8ab635..f4b3960d65e 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -60,7 +60,7 @@
 #define ACE_HAS_SYSINFO
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H
-#define ACE_HAS_TERM_IOCTLS
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_TIMOD_H
diff --git a/ace/config-unixware-7.1.0.h b/ace/config-unixware-7.1.0.h
index 0881e9bfe31..ea92a0a0393 100644
--- a/ace/config-unixware-7.1.0.h
+++ b/ace/config-unixware-7.1.0.h
@@ -268,8 +268,8 @@
 /* Platform provides <sys/xti.h> header */
 #define ACE_HAS_SYS_XTI_H 1
 
-/* Platform has terminal ioctl flags like TCGETS and TCSETS. */
-#define ACE_HAS_TERM_IOCTLS 1
+/* Platform has POSIX terminal interface. */
+#define ACE_HAS_TERMIOS 1
 
 /* Platform supports threads */
 #define ACE_HAS_THREADS 1
diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h
index c259987b49e..9481dc88a2c 100644
--- a/ace/config-unixware-7.1.0.udk.h
+++ b/ace/config-unixware-7.1.0.udk.h
@@ -333,8 +333,8 @@
    as formal arguments to a template class. */
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
 
-/* Platform has terminal ioctl flags like TCGETS and TCSETS. */
-#define ACE_HAS_TERM_IOCTLS 1
+/* Platform has POSIX terminal interface. */
+#define ACE_HAS_TERMIOS 1
 
 /* Platform supports threads */
 #define ACE_HAS_THREADS 1
diff --git a/ace/config-win32-interix.h b/ace/config-win32-interix.h
index 1138391bce7..9d9f25ee7a3 100644
--- a/ace/config-win32-interix.h
+++ b/ace/config-win32-interix.h
@@ -73,10 +73,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_SVR4_GETTIMEOFDAY
 #define ACE_HAS_UALARM
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_HAS_NEW_TERMIOS_STRUCT
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
+#define ACE_HAS_TERMIOS
 #define ACE_HAS_SIGWAIT
 #define ACE_LACKS_RTTI                      // DLL_Test checks RTTI, and it fails so...