From 6bd02aa5046b606171a680e6f8aefba31b744af1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 11:42:35 +0000
Subject: r3478: split out some more pieces of includes.h (This used to be
 commit 8e9212ecfc61c509f686363d8ec412ce54bc1c8d)

---
 source4/include/system/terminal.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source4/include/system/terminal.h')

diff --git a/source4/include/system/terminal.h b/source4/include/system/terminal.h
index abc661d7ac..b727f8e7fa 100644
--- a/source4/include/system/terminal.h
+++ b/source4/include/system/terminal.h
@@ -20,6 +20,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef SUNOS4
+/* on SUNOS4 termios.h conflicts with sys/ioctl.h */
+#undef HAVE_TERMIOS_H
+#endif
+
+
 #if defined(HAVE_TERMIOS_H)
 /* POSIX terminal handling. */
 #include <termios.h>
-- 
cgit