On Mi, 30 Okt 2024, 'John Marriott' via vim_dev wrote:

> After this patch, my Windows x64 build fails with this error because
> FEAT_DIFF is not defined:
> <snip>
> clang -c -I. -Iproto -DWIN32 -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00
> -DHAVE_PATHDEF -DFEAT_NORMAL -DHAVE_STDINT_H -D__USE_MINGW_ANSI_STDIO -pipe
> -Wall -O3 -fomit-frame-pointer -fpie -fPIE -DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
> evalfunc.c -o gobjx86-64/evalfunc.o
> evalfunc.c:8364:15: error: no member named 'w_p_diff' in 'struct window_S'
>  8364 |                 if (curwin->w_p_diff &&
> switchwin.sw_curwin->w_p_diff)
>       |                     ~~~~~~  ^
> evalfunc.c:8364:48: error: no member named 'w_p_diff' in 'struct window_S'
>  8364 |                 if (curwin->w_p_diff &&
> switchwin.sw_curwin->w_p_diff)
>       | ~~~~~~~~~~~~~~~~~~~  ^
> evalfunc.c:8369:18: error: no member named 'w_p_diff' in 'struct window_S'
>  8369 |             if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
>       |                 ~~~~~~  ^
> evalfunc.c:8369:51: error: no member named 'w_p_diff' in 'struct window_S'
>  8369 |             if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
>       |                                     ~~~~~~~~~~~~~~~~~~~  ^
> 4 errors generated.
> make: *** [Make_cyg_ming.mak:1252: gobjx86-64/evalfunc.o] Error 1
> </snip>
> 
> The attached patch fixes the build failure but I'm not sure if it's the
> right fix.

Thanks. This looks fine. I wonder why CI didn't catch it.

Thanks,
Christian
-- 
"If you understand what you're doing, you're not learning anything."
                -- A. L.

-- 
-- 
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit 
https://groups.google.com/d/msgid/vim_dev/ZyNTjyPxctREX3Vq%40256bit.org.

Raspunde prin e-mail lui