On 05-Nov-2013 Lech Lorens <[email protected]> wrote: > On 5 November 2013 10:56, Christian J. Robinson <[email protected]> wrote: > > On Tue, 5 Nov 2013, Lech Lorens wrote: > > > >> On 5 November 2013 08:22, Christian J. Robinson <[email protected]> wrote: > >>> > >>> > >>> /usr/lib/../include/w32api/winnt.h:4951:15: error: two or more > >>> data types in declaration specifiers > >>> /usr/lib/../include/w32api/winnt.h:5090:13: error: two or more > >>> data types in declaration specifiers > >> > >> > >> I believe (but I am not sure) this is caused by a change in Cygwin. > >> For me 7.4.22 stopped building although it used to build just fine. > > > > > > I didn't run any cygwin updates that day between Vim builds. If it is > > cygwin's fault, I can't explain how I got one working build and not another. > > > > - Christian > > > > -- > > If knowledge can create problems, it is not through ignorance that we can > > solve them. -- Isaac Asimov > > > > Christian J. Robinson <[email protected]> > > http://christianrobinson.name/ > > And I can't explain how it's possible that I can't rebuild the very > same sources I used to compile the version of Vim I am using. Just > checked -- seems I can't build any version of Vim (tried 7.4.22, > 7.4.1, 7.3.500). > Unfortunately, at the moment I don't have time to look into it. > > Cheers, > Lech
Seems it is a known problem. We should be including Xwindows.h instead of windows.h. The attached patch fixes it. Cheers, Lech -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
diff --git a/src/mbyte.c b/src/mbyte.c index 6340992..cb14a25 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__) /*
