Patch 8.0.0765

29 views
Skip to first unread message

Bram Moolenaar

unread,
Jul 23, 2017, 4:57:23 PM7/23/17
to vim...@googlegroups.com

Patch 8.0.0765
Problem: Build fails with tiny features.
Solution: Adjust #ifdef. (John Marriott)
Files: src/option.c, src/option.h


*** ../vim-8.0.0764/src/option.c 2017-07-23 22:50:47.263173163 +0200
--- src/option.c 2017-07-23 22:52:13.966588849 +0200
***************
*** 57,65 ****
#define PV_AI OPT_BUF(BV_AI)
#define PV_AR OPT_BOTH(OPT_BUF(BV_AR))
#define PV_BKC OPT_BOTH(OPT_BUF(BV_BKC))
#ifdef FEAT_QUICKFIX
- # define PV_BH OPT_BUF(BV_BH)
- # define PV_BT OPT_BUF(BV_BT)
# define PV_EFM OPT_BOTH(OPT_BUF(BV_EFM))
# define PV_GP OPT_BOTH(OPT_BUF(BV_GP))
# define PV_MP OPT_BOTH(OPT_BUF(BV_MP))
--- 57,65 ----
#define PV_AI OPT_BUF(BV_AI)
#define PV_AR OPT_BOTH(OPT_BUF(BV_AR))
#define PV_BKC OPT_BOTH(OPT_BUF(BV_BKC))
+ #define PV_BH OPT_BUF(BV_BH)
+ #define PV_BT OPT_BUF(BV_BT)
#ifdef FEAT_QUICKFIX
# define PV_EFM OPT_BOTH(OPT_BUF(BV_EFM))
# define PV_GP OPT_BOTH(OPT_BUF(BV_GP))
# define PV_MP OPT_BOTH(OPT_BUF(BV_MP))
*** ../vim-8.0.0764/src/option.h 2017-07-15 19:22:33.642179911 +0200
--- src/option.h 2017-07-23 22:55:20.869326573 +0200
***************
*** 988,999 ****
{
BV_AI = 0
, BV_AR
- #ifdef FEAT_QUICKFIX
, BV_BH
- #endif
, BV_BKC
- #ifdef FEAT_QUICKFIX
, BV_BT
, BV_EFM
, BV_GP
, BV_MP
--- 988,997 ----
{
BV_AI = 0
, BV_AR
, BV_BH
, BV_BKC
, BV_BT
+ #ifdef FEAT_QUICKFIX
, BV_EFM
, BV_GP
, BV_MP
*** ../vim-8.0.0764/src/version.c 2017-07-23 22:50:47.263173163 +0200
--- src/version.c 2017-07-23 22:56:26.524882306 +0200
***************
*** 771,772 ****
--- 771,774 ----
{ /* Add new patch number below this line */
+ /**/
+ 765,
/**/

--
hundred-and-one symptoms of being an internet addict:
227. You sleep next to your monitor. Or on top of it.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

M Kelly

unread,
Jul 25, 2017, 5:57:58 AM7/25/17
to vim_dev
Hi,

I get a build error on ubuntu with gcc with v8.0.765:

gui_x11.c: In function ‘gui_mch_get_color’:
gui_x11.c:2274:14: warning: unused variable ‘colormap’ [-Wunused-variable]
Colormap colormap;
^
gui_x11.c:2273:17: warning: unused variable ‘available’ [-Wunused-variable]
XColor available;
^
gui_x11.c: In function ‘gui_mch_get_rgb_color’:
gui_x11.c:2300:5: error: ‘colormap’ undeclared (first use in this function)
colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy));
^
gui_x11.c:2300:5: note: each undeclared identifier is reported only once for each function it appears in
gui_x11.c:2301:55: error: ‘available’ undeclared (first use in this function)
if (XParseColor(gui.dpy, colormap, (char *)spec, &available) != 0

Reply all
Reply to author
Forward
0 new messages