summaryrefslogtreecommitdiff
path: root/source4/include/system/terminal.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 11:42:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:20 -0500
commit6bd02aa5046b606171a680e6f8aefba31b744af1 (patch)
tree9b87ee2247f8db0d410718b26b8f34db37532af8 /source4/include/system/terminal.h
parentf74ea959fe88e752b876791d2a3b998a88bd9800 (diff)
downloadsamba-6bd02aa5046b606171a680e6f8aefba31b744af1.tar.gz
samba-6bd02aa5046b606171a680e6f8aefba31b744af1.tar.bz2
samba-6bd02aa5046b606171a680e6f8aefba31b744af1.zip
r3478: split out some more pieces of includes.h
(This used to be commit 8e9212ecfc61c509f686363d8ec412ce54bc1c8d)
Diffstat (limited to 'source4/include/system/terminal.h')
-rw-r--r--source4/include/system/terminal.h6
1 files changed, 6 insertions, 0 deletions
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>