diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-01-14 13:26:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-01-14 13:26:21 +0100 |
| commit | ca058dc71f53a4d08f553468e8fda5ea961b3f2b (patch) | |
| tree | 533bcdf5cfa7f86ff49b25f2caf2dd4dcfc2f54c /src/mbyte.c | |
| parent | 6cd3aeee4c0fbd0751122395af0ab895abda027e (diff) | |
| download | vim-git-ca058dc71f53a4d08f553468e8fda5ea961b3f2b.tar.gz | |
updated for version 7.4.148v7.4.148
Problem: Cannot build with Cygwin and X11.
Solution: Include Xwindows.h instead of windows.h. (Lech Lorens)
Diffstat (limited to 'src/mbyte.c')
| -rw-r--r-- | src/mbyte.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 6340992de..cb14a25fa 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -83,10 +83,18 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# include <windows.h> +# if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD) +# include <X11/Xwindows.h> +# define WINBYTE wBYTE +# else +# include <windows.h> +# define WINBYTE BYTE +# endif # ifdef WIN32 # undef WIN32 /* Some windows.h define WIN32, we don't want that here. */ # endif +#else +# define WINBYTE BYTE #endif #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__) @@ -698,7 +706,7 @@ codepage_invalid: /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows * CodePage identifier, which we can pass directly in to Windows * API */ - n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1; + n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1; #else # if defined(MACOS) || defined(__amigaos4__) /* |