To: vim_dev@googlegroups.com
Subject: Patch 8.2.0515
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0515
Problem:    Some compilers cannot add to "void *".
Solution:   Cast to "char *".
Files:      src/vim9compile.c


*** ../vim-8.2.0514/src/vim9compile.c	2020-04-05 18:20:41.432605075 +0200
--- src/vim9compile.c	2020-04-05 19:07:54.686763259 +0200
***************
*** 368,374 ****
      functype->tt_args = ALLOC_CLEAR_MULT(type_T *, argcount);
      if (functype->tt_args == NULL)
  	return FAIL;
!     ((type_T **)type_gap->ga_data)[type_gap->ga_len] = (void *)functype->tt_args;
      ++type_gap->ga_len;
  
      functype->tt_argcount = argcount;
--- 368,375 ----
      functype->tt_args = ALLOC_CLEAR_MULT(type_T *, argcount);
      if (functype->tt_args == NULL)
  	return FAIL;
!     ((type_T **)type_gap->ga_data)[type_gap->ga_len] =
! 						     (void *)functype->tt_args;
      ++type_gap->ga_len;
  
      functype->tt_argcount = argcount;
***************
*** 1846,1852 ****
  
  	    if (i > 0)
  	    {
! 		STRCPY(ga.ga_data + ga.ga_len, ", ");
  		ga.ga_len += 2;
  	    }
  	    len = (int)STRLEN(arg_type);
--- 1847,1853 ----
  
  	    if (i > 0)
  	    {
! 		STRCPY((char *)ga.ga_data + ga.ga_len, ", ");
  		ga.ga_len += 2;
  	    }
  	    len = (int)STRLEN(arg_type);
***************
*** 1856,1868 ****
  		return "[unknown]";
  	    }
  	    *tofree = ga.ga_data;
! 	    STRCPY(ga.ga_data + ga.ga_len, arg_type);
  	    ga.ga_len += len;
  	    vim_free(arg_free);
  	}
  
  	if (type->tt_member == &t_void)
! 	    STRCPY(ga.ga_data + ga.ga_len, ")");
  	else
  	{
  	    char *ret_free;
--- 1857,1869 ----
  		return "[unknown]";
  	    }
  	    *tofree = ga.ga_data;
! 	    STRCPY((char *)ga.ga_data + ga.ga_len, arg_type);
  	    ga.ga_len += len;
  	    vim_free(arg_free);
  	}
  
  	if (type->tt_member == &t_void)
! 	    STRCPY((char *)ga.ga_data + ga.ga_len, ")");
  	else
  	{
  	    char *ret_free;
***************
*** 1876,1883 ****
  		return "[unknown]";
  	    }
  	    *tofree = ga.ga_data;
! 	    STRCPY(ga.ga_data + ga.ga_len, "): ");
! 	    STRCPY(ga.ga_data + ga.ga_len + 3, ret_name);
  	    vim_free(ret_free);
  	}
  	return ga.ga_data;
--- 1877,1884 ----
  		return "[unknown]";
  	    }
  	    *tofree = ga.ga_data;
! 	    STRCPY((char *)ga.ga_data + ga.ga_len, "): ");
! 	    STRCPY((char *)ga.ga_data + ga.ga_len + 3, ret_name);
  	    vim_free(ret_free);
  	}
  	return ga.ga_data;
*** ../vim-8.2.0514/src/version.c	2020-04-05 18:56:02.233436590 +0200
--- src/version.c	2020-04-05 19:08:39.626590262 +0200
***************
*** 740,741 ****
--- 740,743 ----
  {   /* Add new patch number below this line */
+ /**/
+     515,
  /**/

-- 
It is illegal for anyone to try and stop a child from playfully jumping over
puddles of water.
		[real standing law in California, United States of America]

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///