To: vim-dev@vim.org
Subject: Patch 6.1a.038
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1a.038
Problem:    Solaris: Including both sys/sysctl.h and sys/sysinfo.h doesn't
            work. (Antonio Colombo)
Solution:   Don't include sys/sysinfo.h when not calling sysinfo().
Files:      src/os_unix.c


*** ../vim61a.037/src/os_unix.c	Thu Mar  7 20:14:43 2002
--- src/os_unix.c	Fri Mar  8 20:58:41 2002
***************
*** 412,421 ****
  # ifdef HAVE_SYS_RESOURCE_H
  #  include <sys/resource.h>
  # endif
! # ifdef HAVE_SYS_SYSCTL_H
  #  include <sys/sysctl.h>
  # endif
! # ifdef HAVE_SYS_SYSINFO_H
  #  include <sys/sysinfo.h>
  # endif
  
--- 412,421 ----
  # ifdef HAVE_SYS_RESOURCE_H
  #  include <sys/resource.h>
  # endif
! # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
  # endif
! # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO)
  #  include <sys/sysinfo.h>
  # endif
  
*** ../vim61a.037/src/version.c	Fri Mar  8 20:53:46 2002
--- src/version.c	Fri Mar  8 20:56:08 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     38,
  /**/

-- 
$ echo pizza > /dev/oven

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///