To: vim-dev@vim.org
Subject: Patch 6.3a.027 (extra)
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.3a.027 (extra, after 6.3a.026)
Problem:    Compiler warning for function argument.
Solution:   Declare both char and WCHAR arrays.
Files:	    src/gui_w48.c


*** ../vim-6.3a.026/src/gui_w48.c	Sat May 15 17:09:08 2004
--- src/gui_w48.c	Sat May 15 21:55:11 2004
***************
*** 3102,3111 ****
  # define DRAGQVAL 0xFFFF
  #endif
  #ifdef FEAT_MBYTE
!     WCHAR    szFile[BUFPATHLEN];
! #else
!     char    szFile[BUFPATHLEN];
  #endif
      UINT    cFiles = DragQueryFile(hDrop, DRAGQVAL, NULL, 0);
      UINT    i;
      char_u  **fnames;
--- 3102,3110 ----
  # define DRAGQVAL 0xFFFF
  #endif
  #ifdef FEAT_MBYTE
!     WCHAR   wszFile[BUFPATHLEN];
  #endif
+     char    szFile[BUFPATHLEN];
      UINT    cFiles = DragQueryFile(hDrop, DRAGQVAL, NULL, 0);
      UINT    i;
      char_u  **fnames;
***************
*** 3128,3135 ****
  	for (i = 0; i < cFiles; ++i)
  	{
  #ifdef FEAT_MBYTE
! 	    if (DragQueryFileW(hDrop, i, szFile, BUFPATHLEN) > 0)
! 		fnames[i] = ucs2_to_enc(szFile, NULL);
  	    else
  #endif
  	    {
--- 3127,3134 ----
  	for (i = 0; i < cFiles; ++i)
  	{
  #ifdef FEAT_MBYTE
! 	    if (DragQueryFileW(hDrop, i, wszFile, BUFPATHLEN) > 0)
! 		fnames[i] = ucs2_to_enc(wszFile, NULL);
  	    else
  #endif
  	    {
*** ../vim-6.3a.026/src/version.c	Sat May 15 17:09:08 2004
--- src/version.c	Sat May 15 21:56:19 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     27,
  /**/

-- 
Computers are not intelligent.  They only think they are.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///