lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
485eb43
To: vim-dev@vim.org
485eb43
Subject: Patch 7.0.028 (extra)
485eb43
Fcc: outbox
485eb43
From: Bram Moolenaar <Bram@moolenaar.net>
485eb43
Mime-Version: 1.0
485eb43
Content-Type: text/plain; charset=ISO-8859-1
485eb43
Content-Transfer-Encoding: 8bit
485eb43
------------
485eb43
485eb43
Patch 7.0.028 (extra)
485eb43
Problem:    OS/2: Vim doesn't compile with gcc 3.2.1.
485eb43
Solution:   Add argument to after_pathsep(), don't define vim_handle_signal(),
485eb43
	    define HAVE_STDARG_H. (David Sanders)
485eb43
Files:	    src/os_unix.c, src/vim.h, src/os_os2_cfg.h
485eb43
485eb43
485eb43
*** ../vim-7.0.027/src/os_unix.c	Thu Jun 22 18:06:48 2006
485eb43
--- src/os_unix.c	Sat Jun 17 21:00:14 2006
485eb43
***************
485eb43
*** 4971,4977 ****
485eb43
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
485eb43
  		    {
485eb43
  			STRCPY((*file)[*num_file], p);
485eb43
! 			if (!after_pathsep((*file)[*num_file] + len))
485eb43
  			{
485eb43
  			    (*file)[*num_file][len] = psepc;
485eb43
  			    (*file)[*num_file][len + 1] = NUL;
485eb43
--- 4971,4978 ----
485eb43
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
485eb43
  		    {
485eb43
  			STRCPY((*file)[*num_file], p);
485eb43
! 			if (!after_pathsep((*file)[*num_file],
485eb43
! 						    (*file)[*num_file] + len))
485eb43
  			{
485eb43
  			    (*file)[*num_file][len] = psepc;
485eb43
  			    (*file)[*num_file][len + 1] = NUL;
485eb43
*** ../vim-7.0.027/src/vim.h	Sun Apr 30 20:27:22 2006
485eb43
--- src/vim.h	Sat Jun 17 20:59:31 2006
485eb43
***************
485eb43
*** 1983,1989 ****
485eb43
  /* values for vim_handle_signal() that are not a signal */
485eb43
  #define SIGNAL_BLOCK	-1
485eb43
  #define SIGNAL_UNBLOCK  -2
485eb43
! #if !defined(UNIX) && !defined(VMS)
485eb43
  # define vim_handle_signal(x) 0
485eb43
  #endif
485eb43
  
485eb43
--- 1983,1989 ----
485eb43
  /* values for vim_handle_signal() that are not a signal */
485eb43
  #define SIGNAL_BLOCK	-1
485eb43
  #define SIGNAL_UNBLOCK  -2
485eb43
! #if !defined(UNIX) && !defined(VMS) && !defined(OS2)
485eb43
  # define vim_handle_signal(x) 0
485eb43
  #endif
485eb43
  
485eb43
*** ../vim-7.0.027/src/os_os2_cfg.h	Sun Jun 13 18:47:02 2004
485eb43
--- src/os_os2_cfg.h	Sat Jun 17 20:58:56 2006
485eb43
***************
485eb43
*** 183,188 ****
485eb43
--- 183,191 ----
485eb43
  /* Define if you have the ANSI C header files. */
485eb43
  /* #undef STDC_HEADERS */
485eb43
  
485eb43
+ /* added by David Sanders */
485eb43
+ #define HAVE_STDARG_H 1
485eb43
+ 
485eb43
  /* instead, we check a few STDC things ourselves */
485eb43
  #define HAVE_STDLIB_H	1
485eb43
  #undef HAVE_STRING_H	/* On EMX it is better to use strings.h */
485eb43
*** ../vim-7.0.027/src/version.c	Thu Jun 22 19:34:23 2006
485eb43
--- src/version.c	Thu Jun 22 19:41:06 2006
485eb43
***************
485eb43
*** 668,669 ****
485eb43
--- 668,671 ----
485eb43
  {   /* Add new patch number below this line */
485eb43
+ /**/
485eb43
+     28,
485eb43
  /**/
485eb43
485eb43
-- 
485eb43
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
485eb43
ARTHUR:       What do you mean?  An African or European swallow?
485eb43
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
485eb43
   BRIDGEKEEPER is cast into the gorge.
485eb43
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
485eb43
485eb43
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
485eb43
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
485eb43
\\\        download, build and distribute -- http://www.A-A-P.org        ///
485eb43
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///