To: vim-dev@vim.org
Subject: Patch 6.1.419
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.1.419
Problem:    Vim doesn't compile on AIX 5.1.
Solution:   Don't define _NO_PROTO on this system. (Uribarri)
Files:	    src/auto/configure, src/configure.in


*** ../vim61.418/src/auto/configure	Sat Mar 15 16:11:20 2003
--- src/auto/configure	Mon Mar 24 19:23:58 2003
***************
*** 4840,4854 ****
  
  
  echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6
! echo "configure:4744: checking if strings.h can be included after string.h" >&5
  cppflags_save=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  cat > conftest.$ac_ext <<EOF
! #line 4748 "configure"
  #include "confdefs.h"
  
! #if defined(_AIX) && !defined(_NO_PROTO)
  # define _NO_PROTO	/* like in os_unix.h, causes conflict for AIX (Winn) */
  #endif
  #ifdef HAVE_XM_XM_H
  # include <Xm/Xm.h>	/* This breaks it for HP-UX 11 (Squassabia) */
--- 4840,4855 ----
  
  
  echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6
! echo "configure:4844: checking if strings.h can be included after string.h" >&5
  cppflags_save=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  cat > conftest.$ac_ext <<EOF
! #line 4848 "configure"
  #include "confdefs.h"
  
! #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)
  # define _NO_PROTO	/* like in os_unix.h, causes conflict for AIX (Winn) */
+ 			/* but don't do it on AIX 5.1 (Uribarri) */
  #endif
  #ifdef HAVE_XM_XM_H
  # include <Xm/Xm.h>	/* This breaks it for HP-UX 11 (Squassabia) */
*** ../vim61.418/src/configure.in	Sat Mar 15 16:11:20 2003
--- src/configure.in	Mon Mar 24 19:23:56 2003
***************
*** 1465,1472 ****
  cppflags_save=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  AC_TRY_COMPILE([
! #if defined(_AIX) && !defined(_NO_PROTO)
  # define _NO_PROTO	/* like in os_unix.h, causes conflict for AIX (Winn) */
  #endif
  #ifdef HAVE_XM_XM_H
  # include <Xm/Xm.h>	/* This breaks it for HP-UX 11 (Squassabia) */
--- 1465,1473 ----
  cppflags_save=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  AC_TRY_COMPILE([
! #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)
  # define _NO_PROTO	/* like in os_unix.h, causes conflict for AIX (Winn) */
+ 			/* but don't do it on AIX 5.1 (Uribarri) */
  #endif
  #ifdef HAVE_XM_XM_H
  # include <Xm/Xm.h>	/* This breaks it for HP-UX 11 (Squassabia) */
*** ../vim61.418/src/version.c	Wed Mar 26 21:48:04 2003
--- src/version.c	Wed Mar 26 22:09:51 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     419,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
230. You spend your Friday nights typing away at your keyboard

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///