--- xv.h.orig	Mon Aug 23 00:36:59 2004
+++ xv.h	Mon Aug 23 00:42:13 2004
@@ -115,7 +115,7 @@
 #ifndef VMS
 #  include <errno.h>
    extern int   errno;             /* SHOULD be in errno.h, but often isn't */
-#  ifndef __NetBSD__
+#  if defined (__NetBSD__) && !defined(__APPLE__)
      extern char *sys_errlist[];     /* this too... */
 #  endif
 #endif
@@ -163,6 +163,8 @@
 
 #  if defined(hp300) || defined(hp800) || defined(NeXT)
 #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
+#  elif defined(__APPLE__)
+#   include <malloc/malloc.h>
 #  else
 #   include <malloc.h>
 #  endif