--- xv.h.orig	2008-04-07 02:44:16.000000000 +0200
+++ xv.h	2008-04-07 02:48:12.000000000 +0200
@@ -161,7 +161,11 @@
 #  ifndef __NetBSD__
 #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
-       extern char *sys_errlist[]; /* this too... */
+#      if defined(__DARWIN__)
+         extern __const char *__const sys_errlist[];
+#      else
+         extern char *sys_errlist[]; /* this too... */
+#      endif
 #    endif
 #  endif
 #endif
@@ -204,7 +208,7 @@
  *                __DARWIN__, VMS.)  Anyone who _does_ need it can explicitly
  *                define NEED_MALLOC_H in the makefile. */
 #ifdef NEED_MALLOC_H
-#  if defined(hp300) || defined(hp800) || defined(NeXT)
+#  if defined(hp300) || defined(hp800) || defined(NeXT) || defined(__DARWIN__)
 #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
 #  else
 #    include <malloc.h>