--- pgp/src/zunzip.h 2018/04/24 16:41:03 1.1.1.5 +++ pgp/src/zunzip.h 2018/04/24 16:45:30 1.1.1.8 @@ -62,7 +62,7 @@ And now, our MS-DOS and OS/2 corner: ---------------------------------------------------------------------------*/ -#ifdef __TURBOC__ +#if defined(__TURBOC__) && !defined(__PUREC__) # define DOS_OS2 /* Turbo C under DOS, MSC under DOS or OS2 */ # ifndef __BORLANDC__ /* There appears to be a bug ?? in Borland's */ # include @@ -121,7 +121,11 @@ # define SHORT_NAMES # define tzset settz # else /* !COHERENT */ -# include /* #define O_BINARY 0x8000 (no CR/LF */ +# ifndef __PUREC__ +# ifndef C370 /* not defined in C370 library */ +# include /* #define O_BINARY 0x8000 (no CR/LF */ +# endif /* !C370 */ +# endif # endif /* ?COHERENT */ /* translation), as used in open() */ # endif /* ?MTS */ # endif /* ?V7 */ @@ -131,14 +135,13 @@ And some Mac stuff for good measure: ---------------------------------------------------------------------------*/ -#ifdef THINK_C +#ifdef MACTC5 # define MACOS # ifndef __STDC__ /* THINK_C isn't truly ANSI-standard, */ # define __STDC__ 1 /* but it understands prototypes...so */ # endif /* it's close enough for our purposes */ # include # include -# include "macstat.h" #endif #ifdef MPW /* not tested yet - should be easy enough tho */ # define MACOS @@ -169,8 +172,13 @@ #define MAX_BITS 13 /* used in unShrink() */ #define HSIZE (1 << MAX_BITS) /* size of global work area */ +#ifdef EBCDIC /* already defined in usuals.h */ +#undef LF +#undef CR +#else #define LF 10 /* '\n' on ASCII machines. Must be 10 due to EBCDIC */ #define CR 13 /* '\r' on ASCII machines. Must be 13 due to EBCDIC */ +#endif #ifdef AMIGA # define FFLUSH fflush(stderr); @@ -293,7 +301,8 @@ int unzip __( ( FILE *inFile, FILE *ou * */ -#define PEEKBIT(nbits) ( nbits > bits_left ? (FillBitBuffer(), bitbuf & mask_bits[nbits]) : bitbuf & mask_bits[nbits] ) +#define PEEKBIT(nbits) ( nbits > bits_left ? \ +(FillBitBuffer(), bitbuf & mask_bits[nbits]) : bitbuf & mask_bits[nbits] ) #endif