--- pgp/src/zunzip.h	2018/04/24 16:40:12	1.1.1.4
+++ pgp/src/zunzip.h	2018/04/24 16:43:39	1.1.1.7
@@ -206,7 +206,7 @@ typedef unsigned long    ULONG;
 #ifdef PROTO
 
 /* The following is for non-ansi compilers supporting prototypes */
-/* (e.g. old SGI compilers and Borland C in non-ansi mode */ 
+/* (e.g. old SGI compilers and Borland C in non-ansi mode */
 
 #define __(X)   X   /*  Inc.  Should probably give them a call and see   */
 #endif
@@ -231,8 +231,12 @@ typedef unsigned long    ULONG;
 int    open_input_file           __( (void) );
 int    readbuf                   __( (char *buf, register unsigned size) );
 int    create_output_file        __( (void) );
+#if 0
 int    FillBitBuffer             __( (void) );
 int    ReadByte                  __( (UWORD *x) );
+#else
+int    FillInBuf                 __( (void) );
+#endif
 int    FlushOutput               __( (void) );
 
 /*---------------------------------------------------------------------------
@@ -241,8 +245,8 @@ int    FlushOutput               __( (vo
     ble to external functions):
   ---------------------------------------------------------------------------*/
 
-void   inflate                  __( (void) );                  /* inflate.c */
-int unzip				__( ( FILE *inFile, FILE *outFile ) );
+int inflate			__( (void) );            /* inflate.c */
+int unzip			__( ( FILE *inFile, FILE *outFile ) );
 
 /************/
 /*  Macros  */
@@ -265,12 +269,14 @@ int unzip				__( ( FILE *inFile, FILE *o
  */
 
 
+#if 0
+
 #define READBIT(nbits,zdest) \
 	do \
 	{ \
 		if(nbits>bits_left) \
 			FillBitBuffer(); \
-  		zdest=(int)(bitbuf&mask_bits[nbits]); \
+		zdest=(int)(bitbuf&mask_bits[nbits]); \
 		bitbuf>>=nbits; \
 		bits_left-=nbits; \
 	} while(0)
@@ -287,13 +293,18 @@ int unzip				__( ( FILE *inFile, FILE *o
  *
  */
 
-#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
 
 /*************/
 /*  Globals  */
 /*************/
 
+#if 0 /* FIX */
    extern longint   csize;
+#endif
 
    extern ULONG     mask_bits[];