Re: pkg/31871

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

The following reply was made to PR pkg/31871; it has been noted by GNATS.

From: "John D. Baker" <jdbaker%mylinuxisp.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/31871
Date: Tue, 13 Dec 2005 16:11:22 -0600 (CST)

 It turns out that the affected files (xv.h, vdcomp.c) already include
 <stdlib.h>, so the patches may be shortened to:
 
 --- work/xv-3.10a/xv.h.orig     2005-12-13 16:04:22.000000000 -0600
 +++ work/xv-3.10a/xv.h  2005-12-13 16:05:17.000000000 -0600
 @@ -213,7 +213,9 @@
  #  if defined(hp300) || defined(hp800) || defined(NeXT)
  #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
  #  else
 -#   include <malloc.h>
 +#    if !defined(__DARWIN__)
 +#      include <malloc.h>
 +#    endif
  #  endif
  # endif
  #endif /* !VMS */
 
 
 
 --- work/xv-3.10a/vdcomp.c.orig 2005-12-13 16:09:51.000000000 -0600
 +++ work/xv-3.10a/vdcomp.c      2005-12-13 16:10:31.000000000 -0600
 @@ -116,7 +116,8 @@
  #  if defined(hp300) || defined(hp800) || defined(NeXT)
  #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
  #  else
 -#   if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 +#   if !defined(__386BSD__) && !defined(__FreeBSD__) \
 +    && !defined(__NetBSD__) && !defined(__DARWIN__)
      /*
       I want to use BSD macro for checking if this OS is *BSD or not,
       but the macro is defined in <sys/parm.h>, which I don't know all
 
 
 -- 
 John D. Baker, KN5UKS                    NetBSD     Darwin/MacOS X
 jdbaker(at)mylinuxisp(dot)com                 OpenBSD            FreeBSD
 BSD -- It just sits there and _works_!
 GPG fingerprint:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645