--- pgp/src/ztailor.h	2018/04/24 16:42:05	1.1.1.5
+++ pgp/src/ztailor.h	2018/04/24 16:43:27	1.1.1.6
@@ -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
@@ -150,7 +158,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