thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.148

Browse Source 
Problem:    Cannot build with Cygwin and X11.
Solution:   Include Xwindows.h instead of windows.h. (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2014-01-14 13:26:21 +01:00
parent 6cd3aeee4c
commit ca058dc71f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mbyte.c
View File

@@ -83,10 +83,18 @@
# ifndef WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# endif # endif
# if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD)
# include <X11/Xwindows.h>
# define WINBYTE wBYTE
# else
# include <windows.h> # include <windows.h>
# define WINBYTE BYTE
# endif
# ifdef WIN32 # ifdef WIN32
# undef WIN32 /* Some windows.h define WIN32, we don't want that here. */ # undef WIN32 /* Some windows.h define WIN32, we don't want that here. */
# endif # endif
#else
# define WINBYTE BYTE
#endif #endif
#if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__) #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
@@ -698,7 +706,7 @@ codepage_invalid:
/* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows
* CodePage identifier, which we can pass directly in to Windows * CodePage identifier, which we can pass directly in to Windows
* API */ * API */
n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1; n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1;
#else #else
# if defined(MACOS) || defined(__amigaos4__) # if defined(MACOS) || defined(__amigaos4__)
/* /*

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
148,
/**/ /**/
147, 147,
/**/ /**/