--- pgp/src/ztailor.h	2018/04/24 16:40:49	1.1.1.4
+++ pgp/src/ztailor.h	2018/04/24 16:45:16	1.1.1.7
@@ -78,6 +78,14 @@
 #  define near
 #  endif
 #else /* !MSDOS */
+#  ifdef __QNX__
+#  undef huge
+#  undef far
+#  undef near
+#  undef farmalloc
+#  undef farfree
+#  undef fcalloc
+#  endif /* __QNX__ */
 #  define huge
 #  define far
 #  define near
@@ -117,8 +125,14 @@ typedef unsigned int extent;
 #  include <types.h>
 #  include <stat.h>
 #else /* !VMS */
-#  include <sys/types.h>
-#  include <sys/stat.h>
+#ifndef __PUREC__
+# ifndef C370
+#  ifndef MACTC5
+#   include <sys/types.h>
+#   include <sys/stat.h>
+#  endif /* MACTC5 */
+# endif /* C370 */
+#endif
 #endif /* ?VMS */
 
 
@@ -150,7 +164,8 @@ typedef unsigned int extent;
  * This is not mandatory, just a speed optimization. The compressed
  * output is strictly identical.
  */
-#if defined(MSDOS) || defined(M_XENIX) || defined(i386) || defined(mc68020) || defined(vax)
+#if defined(MSDOS) || defined(M_XENIX) || defined(i386) || \
+defined(mc68020) || defined(vax)
 #   define UNALIGNED_OK
 #endif