To: vim-dev@vim.org
Subject: Patch 6.1.465
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.465 (after 6.1.454)
Problem:    Compile error when using cygwin.          
Solution:   Change #ifdef WIN32 to #ifdef WIN3264. (Alejandro Lopez-Valencia)
            Undefine WIN32 after including windows.h
Files:      src/mbyte.c
    

*** ../vim61.464/src/mbyte.c	Sun Apr 13 17:43:15 2003
--- src/mbyte.c	Wed Apr 16 14:37:47 2003
***************
*** 82,87 ****
--- 82,90 ----
  #  define WIN32_LEAN_AND_MEAN
  # endif
  # include <windows.h>
+ # ifdef WIN32
+ #  undef WIN32	    /* Some windows.h define WIN32, we don't want that here. */
+ # endif
  #endif
  
  #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
***************
*** 4196,4202 ****
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
! #ifdef WIN32
      /* Win32-specific codepage <-> codepage conversion without iconv. */
      else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
  	    && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
--- 4199,4205 ----
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
! #ifdef WIN3264
      /* Win32-specific codepage <-> codepage conversion without iconv. */
      else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
  	    && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
*** ../vim61.464/src/version.c	Sun Apr 13 21:45:40 2003
--- src/version.c	Sun Apr 13 22:58:36 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     465,
  /**/

-- 
Engineers are always delighted to share wisdom, even in areas in which they
have no experience whatsoever.  Their logic provides them with inherent
insight into any field of expertise.  This can be a problem when dealing with
the illogical people who believe that knowledge can only be derived through
experience.
				(Scott Adams - The Dilbert principle)

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