--- pgp/src/ztailor.h	2018/04/24 16:39:09	1.1.1.3
+++ pgp/src/ztailor.h	2018/04/24 16:43:27	1.1.1.6
@@ -62,12 +62,14 @@
 #  ifdef __TURBOC__
 #    include <alloc.h>
 #    define fcalloc   calloc  /* Assumes that all arrays are < 64K for MSDOS */
+#    define fcfree    free
 #  else /* !__TURBOC__ */
 #    ifndef __GNUC__
 #     include <malloc.h>
 #     define farmalloc _fmalloc
 #     define farfree   _ffree
 #     define fcalloc(nitems,itemsize) halloc((long)(nitems),(itemsize))
+#     define fcfree hfree
 #    endif /* __GNUC__ */
 #  endif /* ?__TURBOC__ */
 #  ifdef NOFAR
@@ -76,12 +78,21 @@
 #  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
 #  define farmalloc malloc
 #  define farfree   free
 #  define fcalloc   calloc
+#  define fcfree    free
 #endif /* ?MSDOS */
 #ifdef __GNUC__
 #  ifdef MSDOS /* MSDOS GNU C == DJGPP */
@@ -91,6 +102,7 @@
 #    define farmalloc malloc
 #    define farfree   free
 #    define fcalloc   calloc
+#    define fcfree    free
 #  endif /* MSDOS */
 #endif /* __GNUC__ */
 
@@ -146,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