Merge from trunk

[gnu-emacs] / src / s / template.h

diff --git a/src/s/template.h b/src/s/template.h
index dd1e56f85534d5cdcadc5882c97a1850a2dfeb64..eb7ca85c5e59afb6fe7d8b000edaee287ab6e7f9 100644 (file)
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -63,18 +63,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'
 
-/* Define HAVE_TERMIOS if the system provides POSIX-style
-   functions and macros for terminal control.
-
-   Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.
-
-   Do not define both.  HAVE_TERMIOS is preferred, if it is
-   supported on your system.  */
-
-#define HAVE_TERMIOS
-/* #define HAVE_TERMIO */
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS