diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | awk.h | 8 | ||||
| -rw-r--r-- | io.c | 4 | ||||
| -rw-r--r-- | mbsupport.h | 7 |
4 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2011-12-06 Arnold D. Robbins <arnold@skeeve.com> + + * awk.h, mbsupport.h: Changes for MBS support on DJGPP + and z/OS. + * io.c: Disable pty support on z/OS. + 2011-11-27 Arnold D. Robbins <arnold@skeeve.com> * dfa.c: Sync with GNU grep. @@ -76,6 +76,10 @@ extern int errno; #endif +#ifdef STDC_HEADERS +#include <stdlib.h> +#endif /* not STDC_HEADERS */ + #include "mbsupport.h" /* defines MBS_SUPPORT */ #if MBS_SUPPORT @@ -131,10 +135,6 @@ typedef int off_t; #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif -#ifdef STDC_HEADERS -#include <stdlib.h> -#endif /* not STDC_HEADERS */ - #include "protos.h" #ifdef HAVE_STRING_H @@ -1594,7 +1594,7 @@ two_way_open(const char *str, struct redirect *rp) } #endif /* HAVE_SOCKETS */ -#ifdef HAVE_TERMIOS_H +#if defined(HAVE_TERMIOS_H) && ! defined(ZOS_USS) /* case 2: use ptys for two-way communications to child */ if (! no_ptys && pty_vs_pipe(str)) { static int initialized = FALSE; @@ -1809,7 +1809,7 @@ two_way_open(const char *str, struct redirect *rp) first_pty_letter = '\0'; /* reset for next command */ return TRUE; } -#endif /* HAVE_TERMIOS_H */ +#endif /* defined(HAVE_TERMIOS_H) && ! defined(ZOS_USS) */ use_pipes: #ifndef PIPES_SIMULATED /* real pipes */ diff --git a/mbsupport.h b/mbsupport.h index 57abaa60..f647d788 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -40,7 +40,7 @@ #if defined(HAVE_ISWCTYPE) \ && defined(HAVE_LOCALE_H) \ - && defined(HAVE_BTOWC) \ + && (defined(HAVE_BTOWC) || defined(ZOS_USS)) \ && defined(HAVE_MBRLEN) \ && defined(HAVE_MBRTOWC) \ && defined(HAVE_WCHAR_H) \ @@ -71,7 +71,10 @@ /* All this glop is for dfa.c. Bleah. */ -#define wchar_t char +#ifndef DJGPP +#define wchar_t char +#endif + #define wctype_t int #define wint_t int #define mbstate_t int |