--- pgp/src/zip.c	2018/04/24 16:38:33	1.1.1.2
+++ pgp/src/zip.c	2018/04/24 16:43:32	1.1.1.6
@@ -7,17 +7,15 @@
 #include "fileio.h"
 #include "language.h"
 #include "pgp.h"
+#include "exitpgp.h"
 
-/* The following are defined in zip.h but it's easier to redefine them here
-   since the header files do wierd things with __STDC__-compatibility */
-
-#define ZE_MEM		4
+#include "ziperr.h" /* for ZE_MEM (and errors[] if ZIPDEBUG defined) */
 
 /* Clean error exit: c is a ZE_-class error, *msg is an error message.
    Issue a message for the error, clean up files and memory, and exit */
 
 void err(int c, char *msg)
-	{
+{
 
 #ifdef ZIPDEBUG
 	if (PERR(c))
@@ -26,19 +24,19 @@ void err(int c, char *msg)
 #endif /* ZIPDEBUG */
 
 	/* Complain and return and out of memory error code */
-	if(c==ZE_MEM)
-	{	fprintf( stderr, PSTR("\nOut of memory\n") );
+	if(c==ZE_MEM) {
+		fprintf( stderr, LANG("\nOut of memory\n") );
 		exitPGP( 7 );
-	}
-	else
-	{	fprintf( stderr, PSTR("\nCompression/decompression error\n") );	/* Yuck */
+	} else {
+		fprintf(stderr,LANG("\nCompression/decompression error\n") );
+		/* Yuck */
 		exitPGP( 23 );
 	}
-	}
+}
 
 /* Internal error, should never happen */
 
 void error(char *msg)
-	{
+{
 	err(-1, msg);
-	}
+}