To: vim-dev@vim.org
Subject: Patch 6.1.089
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.089
Problem:    On BSDI systems there is no ss_sp field in stack_t. (Robert Jan)
Solution:   Use ss_base instead.
Files:	    src/auto/configure, src/configure.in, src/config.h.in,
	    src/os_unix.c


*** ../vim61.088/src/auto/configure	Sat Jun  1 22:36:24 2002
--- src/auto/configure	Fri Jun  7 19:36:12 2002
***************
*** 5250,5258 ****
  EOF
  fi
  
  olibs="$LIBS"
  echo $ac_n "checking --with-tlib argument""... $ac_c" 1>&6
! echo "configure:5248: checking --with-tlib argument" >&5
  # Check whether --with-tlib or --without-tlib was given.
  if test "${with_tlib+set}" = set; then
    withval="$with_tlib"
--- 5250,5290 ----
  EOF
  fi
  
+ echo $ac_n "checking whether stack_t has an ss_base field""... $ac_c" 1>&6
+ echo "configure:5255: checking whether stack_t has an ss_base field" >&5
+ cat > conftest.$ac_ext <<EOF
+ #line 5257 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ #include <signal.h>
+ #include "confdefs.h"
+ 			
+ int main() {
+ stack_t sigstk; sigstk.ss_base = 0; 
+ ; return 0; }
+ EOF
+ if { (eval echo configure:5272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+ #define HAVE_SS_BASE 1
+ EOF
+ 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   echo "$ac_t""no" 1>&6
+ fi
+ rm -f conftest*
+ 
  olibs="$LIBS"
  echo $ac_n "checking --with-tlib argument""... $ac_c" 1>&6
! echo "configure:5288: checking --with-tlib argument" >&5
  # Check whether --with-tlib or --without-tlib was given.
  if test "${with_tlib+set}" = set; then
    withval="$with_tlib"
*** ../vim61.088/src/configure.in	Sat Jun  1 22:36:24 2002
--- src/configure.in	Fri Jun  7 19:36:09 2002
***************
*** 1474,1479 ****
--- 1474,1493 ----
  #define stack_t struct sigaltstack
  EOF
  fi
+ 
+ dnl BSDI uses ss_base while others use ss_sp for the stack pointer.
+ AC_MSG_CHECKING(whether stack_t has an ss_base field)
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ #include <signal.h>
+ #include "confdefs.h"
+ 			], [stack_t sigstk; sigstk.ss_base = 0; ],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SS_BASE),
+ 	AC_MSG_RESULT(no))
  
  olibs="$LIBS"
  AC_MSG_CHECKING(--with-tlib argument)
*** ../vim61.088/src/config.h.in	Mon Feb  4 14:51:51 2002
--- src/config.h.in	Thu Jun  6 21:01:24 2002
***************
*** 91,96 ****
--- 79,87 ----
  
  /* Define to `struct sigaltstack' if <signal.h> doesn't define.  */
  #undef stack_t
+ 
+ /* Define if stack_t has the ss_base field. */
+ #undef HAVE_SS_BASE
  
  /* Define if you can safely include both <sys/time.h> and <time.h>.  */
  #undef TIME_WITH_SYS_TIME
*** ../vim61.088/src/os_unix.c	Wed May 15 22:00:04 2002
--- src/os_unix.c	Thu Jun  6 21:03:14 2002
***************
*** 664,670 ****
--- 664,674 ----
      if (signal_stack != NULL)
      {
  # ifdef HAVE_SIGALTSTACK
+ #  ifdef HAVE_SS_BASE
+ 	sigstk.ss_base = signal_stack;
+ #  else
  	sigstk.ss_sp = signal_stack;
+ #  endif
  	sigstk.ss_size = SIGSTKSZ;
  	sigstk.ss_flags = 0;
  	(void)sigaltstack(&sigstk, NULL);
*** ../vim61.088/src/version.c	Thu Jun  6 20:50:44 2002
--- src/version.c	Sat Jun  8 17:21:44 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     89,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
133. You communicate with people on other continents more than you
     do with your own neighbors.

 ///  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  ///