forked from aniani/vim
patch 8.0.0767: build failure with Athena and Motif
Problem: Build failure with Athena and Motif. Solution: Move local variable delcarations. (Kazunobu Kuriyama)
This commit is contained in:
@@ -2270,8 +2270,6 @@ fontset_ascent(XFontSet fs)
|
|||||||
gui_mch_get_color(char_u *name)
|
gui_mch_get_color(char_u *name)
|
||||||
{
|
{
|
||||||
guicolor_T requested;
|
guicolor_T requested;
|
||||||
XColor available;
|
|
||||||
Colormap colormap;
|
|
||||||
|
|
||||||
/* can't do this when GUI not running */
|
/* can't do this when GUI not running */
|
||||||
if (!gui.in_use || name == NULL || *name == NUL)
|
if (!gui.in_use || name == NULL || *name == NUL)
|
||||||
@@ -2295,6 +2293,8 @@ gui_mch_get_color(char_u *name)
|
|||||||
gui_mch_get_rgb_color(int r, int g, int b)
|
gui_mch_get_rgb_color(int r, int g, int b)
|
||||||
{
|
{
|
||||||
char spec[8]; /* space enough to hold "#RRGGBB" */
|
char spec[8]; /* space enough to hold "#RRGGBB" */
|
||||||
|
XColor available;
|
||||||
|
Colormap colormap;
|
||||||
|
|
||||||
vim_snprintf(spec, sizeof(spec), "#%.2x%.2x%.2x", r, g, b);
|
vim_snprintf(spec, sizeof(spec), "#%.2x%.2x%.2x", r, g, b);
|
||||||
colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy));
|
colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy));
|
||||||
|
@@ -769,6 +769,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 */
|
||||||
|
/**/
|
||||||
|
767,
|
||||||
/**/
|
/**/
|
||||||
766,
|
766,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user