about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-08-16 19:12:26 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-08-16 19:12:26 +0000
commit97cf64a7ee90e7835f723b369fa1f7a35dfdb202 (patch)
tree4418d199d720a4faa5b2429b6622a5d7dce99db2
parent268e56a1446af3ca6df84789180b87ac4f57d1d3 (diff)
downloadzsh-97cf64a7ee90e7835f723b369fa1f7a35dfdb202.tar.gz
zsh-97cf64a7ee90e7835f723b369fa1f7a35dfdb202.tar.xz
zsh-97cf64a7ee90e7835f723b369fa1f7a35dfdb202.zip
Hiramatsu Yoshifumi: 30621 patch-ab (from NetBSD pkgsrc):compilation on
__INTERIX
-rw-r--r--ChangeLog7
-rw-r--r--Src/zsh.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41172b1c1..fe9154528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-16  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Hiramatsu Yoshifumi: 30621 patch-ab (from NetBSD pkgsrc):
+	compilation on __INTERIX
+
 2012-08-16  Peter Stephenson  <pws@csr.com>
 
 	* 30619: Doc/Zsh/builtins.yo, Src/builtin.c,
@@ -61,5 +66,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5696 $
+* $Revision: 1.5697 $
 *****************************************************
diff --git a/Src/zsh.h b/Src/zsh.h
index afe22f059..946102528 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -2135,6 +2135,7 @@ struct ttyinfo {
 #endif
 };
 
+#ifndef __INTERIX
 /* defines for whether tabs expand to spaces */
 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
 #define SGTTYFLAG       shttyinfo.tio.c_oflag
@@ -2152,6 +2153,7 @@ struct ttyinfo {
 #   endif
 #  endif
 # endif
+#endif
 
 /* flags for termflags */