|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.148
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.148
|
|
|
8b9a1c |
Problem: Cannot build with Cygwin and X11.
|
|
|
8b9a1c |
Solution: Include Xwindows.h instead of windows.h. (Lech Lorens)
|
|
|
8b9a1c |
Files: src/mbyte.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.147/src/mbyte.c 2013-11-12 04:43:57.000000000 +0100
|
|
|
8b9a1c |
--- src/mbyte.c 2014-01-14 13:21:36.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 83,92 ****
|
|
|
8b9a1c |
# ifndef WIN32_LEAN_AND_MEAN
|
|
|
8b9a1c |
# define WIN32_LEAN_AND_MEAN
|
|
|
8b9a1c |
# endif
|
|
|
8b9a1c |
! # include <windows.h>
|
|
|
8b9a1c |
# ifdef WIN32
|
|
|
8b9a1c |
# undef WIN32 /* Some windows.h define WIN32, we don't want that here. */
|
|
|
8b9a1c |
# endif
|
|
|
8b9a1c |
#endif
|
|
|
8b9a1c |
|
|
|
8b9a1c |
#if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
|
|
|
8b9a1c |
--- 83,100 ----
|
|
|
8b9a1c |
# ifndef WIN32_LEAN_AND_MEAN
|
|
|
8b9a1c |
# define WIN32_LEAN_AND_MEAN
|
|
|
8b9a1c |
# endif
|
|
|
8b9a1c |
! # if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD)
|
|
|
8b9a1c |
! # include <X11/Xwindows.h>
|
|
|
8b9a1c |
! # define WINBYTE wBYTE
|
|
|
8b9a1c |
! # else
|
|
|
8b9a1c |
! # include <windows.h>
|
|
|
8b9a1c |
! # define WINBYTE BYTE
|
|
|
8b9a1c |
! # endif
|
|
|
8b9a1c |
# ifdef WIN32
|
|
|
8b9a1c |
# undef WIN32 /* Some windows.h define WIN32, we don't want that here. */
|
|
|
8b9a1c |
# endif
|
|
|
8b9a1c |
+ #else
|
|
|
8b9a1c |
+ # define WINBYTE BYTE
|
|
|
8b9a1c |
#endif
|
|
|
8b9a1c |
|
|
|
8b9a1c |
#if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 698,704 ****
|
|
|
8b9a1c |
/* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows
|
|
|
8b9a1c |
* CodePage identifier, which we can pass directly in to Windows
|
|
|
8b9a1c |
* API */
|
|
|
8b9a1c |
! n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1;
|
|
|
8b9a1c |
#else
|
|
|
8b9a1c |
# if defined(MACOS) || defined(__amigaos4__)
|
|
|
8b9a1c |
/*
|
|
|
8b9a1c |
--- 706,712 ----
|
|
|
8b9a1c |
/* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows
|
|
|
8b9a1c |
* CodePage identifier, which we can pass directly in to Windows
|
|
|
8b9a1c |
* API */
|
|
|
8b9a1c |
! n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1;
|
|
|
8b9a1c |
#else
|
|
|
8b9a1c |
# if defined(MACOS) || defined(__amigaos4__)
|
|
|
8b9a1c |
/*
|
|
|
8b9a1c |
*** ../vim-7.4.147/src/version.c 2014-01-14 13:18:53.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2014-01-14 13:24:17.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 148,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
hundred-and-one symptoms of being an internet addict:
|
|
|
8b9a1c |
154. You fondle your mouse.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|