--- pgp/src/zip.h	2018/04/24 16:37:54	1.1.1.1
+++ pgp/src/zip.h	2018/04/24 16:45:54	1.1.1.6
@@ -38,23 +38,7 @@
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
-/* Define malloc() and string functions */
-#ifdef MODERN
-#  include <string.h>
-#else /* !MODERN */
-   voidp *malloc();
-   voidp *calloc();
-   char *getenv();
-   long atol();
-   char *strcpy();
-   char *strcat();
-   char *strchr();
-   char *strrchr();
-#  ifndef ZMEM
-     char *memset();
-     char *memcpy();
-#  endif /* !ZMEM */
-#endif /* ?MODERN */
+#include <string.h>
 
 /* Define fseek() commands */
 #ifndef SEEK_SET
@@ -70,7 +54,7 @@
 #endif /* !SEEK_END */
 
 /* For setting stdout to binary */
-#ifdef MSDOS
+#if defined (MSDOS) || defined(WIN32)
 #  include <io.h>
 #  include <fcntl.h>
 #endif /* MSDOS */
@@ -99,6 +83,7 @@ extern int level;               /* Compr
 
 /* Diagnostic functions */
 #ifdef DEBUG
+  extern char verbose;	/* PGP -l flag */
 # ifdef MSDOS
 #  undef  stderr
 #  define stderr stdout
@@ -139,7 +124,7 @@ void lm_init OF((int pack_level, ush *fl
 ulg  deflate OF((void));
 
         /* in trees.c */
-void ct_init     OF((ush *attr, int *method));
+void ct_init     OF((ush *attr, int *Method));
 int  ct_tally    OF((int dist, int lc));
 ulg  flush_block OF((char *buf, ulg stored_len, int eof));
 
@@ -150,5 +135,10 @@ unsigned bi_reverse OF((unsigned value,
 void     bi_windup  OF((void));
 void     copy_block OF((char far *buf, unsigned len, int header));
 
+#ifdef MACTC5
+#include <unix.h>
+void lm_free(void);
+void ct_free(void);
+#endif
 
 /* end of zip.h */