--- xv.h~	2007-06-24 14:30:42 -0600
+++ xv.h	2007-06-24 14:42:04 -0600
@@ -158,7 +158,7 @@
 
 #ifndef VMS
 #  include <errno.h>
-#  ifndef __NetBSD__
+#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
 #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
        extern char *sys_errlist[]; /* this too... */
@@ -171,7 +171,7 @@
 #ifdef VMS
 #  define ERRSTR(x) strerror(x, vaxc$errno)
 #else
-#  if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
+#  if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
 #    define ERRSTR(x) strerror(x)
 #  else
 #    define ERRSTR(x) sys_errlist[x]
@@ -206,6 +206,8 @@
 #ifdef NEED_MALLOC_H
 #  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
@@ -369,7 +371,7 @@
  *                them later. */
 #ifndef VMS       /* VMS hates multi-line definitions */
 #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-      defined(__bsdi__)
+      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
 #    ifndef USE_MKSTEMP
 #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
 #    endif                      /* >> SECURITY ISSUE << */