Final round of module changes

[openldap] / include / ac / termios.h

diff --git a/include/ac/termios.h b/include/ac/termios.h
index b5adaa94c7a90f3ee0328c3de67b0c51d2bde554..e56eedb0d36bb6b73d8d3ec12826a79d99718d69 100644 (file)
--- a/include/ac/termios.h
+++ b/include/ac/termios.h
@@ -1,11 +1,24 @@
 /* Generic termios.h */
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
 
 #ifndef _AC_TERMIOS_H
 #define _AC_TERMIOS_H
 
-#ifdef HAVE_TERMIOS_H
+#ifdef HAVE_POSIX_TERMIOS
 #include <termios.h>
 
+#ifdef GCWINSZ_IN_SYS_IOCTL
+#include <sys/ioctl.h>
+#endif
+
 #define TERMIO_TYPE    struct termios
 #define TERMFLAG_TYPE  tcflag_t
 #define GETATTR( fd, tiop )    tcgetattr((fd), (tiop))
@@ -13,8 +26,7 @@
 #define GETFLAGS( tio )                ((tio).c_lflag)
 #define SETFLAGS( tio, flags ) ((tio).c_lflag = (flags))
 
-#else /* !HAVE_TERMIOS_H */
-#if defined( HAVE_SGTTY_H )
+#elif defined( HAVE_SGTTY_H )
 #include <sgtty.h>
 
 #ifdef HAVE_SYS_IOCTL_H
@@ -29,6 +41,5 @@
 #define SETFLAGS( tio, flags )  ((tio).sg_flags = (flags))
 
 #endif /* HAVE_SGTTY_H */
-#endif /* HAVE_TERMIOS_H */
 
 #endif /* _AC_TERMIOS_H */