--- pgp/src/zip.h	2018/04/24 16:38:57	1.1.1.2
+++ pgp/src/zip.h	2018/04/24 16:39:40	1.1.1.3
@@ -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
@@ -140,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));