aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1226

Browse Source 
Problem:    GRESOURCE_HDR is unused.
Solution:   Remove it. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2016-01-31 17:56:07 +01:00
parent d14e00ea67
commit 3803bad99d
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/auto/configure vendored
View File

@ -638,7 +638,6 @@ NARROW_PROTO
MOTIF_LIBNAME MOTIF_LIBNAME
GRESOURCE_OBJ GRESOURCE_OBJ
GRESOURCE_SRC GRESOURCE_SRC
GRESOURCE_HDR
GLIB_COMPILE_RESOURCES GLIB_COMPILE_RESOURCES
GNOME_INCLUDEDIR GNOME_INCLUDEDIR
GNOME_LIBDIR GNOME_LIBDIR
@ -9107,7 +9106,6 @@ $as_echo "cannot be found in PATH." >&6; }
$as_echo "usable." >&6; } $as_echo "usable." >&6; }
$as_echo "#define USE_GRESOURCE 1" >>confdefs.h $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
GRESOURCE_HDR="auto/gui_gtk_gresources.h"
GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o" GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi fi
@ -9125,7 +9123,6 @@ fi
if test -z "$SKIP_MOTIF"; then if test -z "$SKIP_MOTIF"; then
gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"

1
src/config.mk.in
View File

@ -161,7 +161,6 @@ MOTIF_LIBNAME = @MOTIF_LIBNAME@
GTK_LIBNAME = @GTK_LIBNAME@ GTK_LIBNAME = @GTK_LIBNAME@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GRESOURCE_HDR = @GRESOURCE_HDR@
GRESOURCE_SRC = @GRESOURCE_SRC@ GRESOURCE_SRC = @GRESOURCE_SRC@
GRESOURCE_OBJ = @GRESOURCE_OBJ@ GRESOURCE_OBJ = @GRESOURCE_OBJ@

2
src/configure.in
View File

@ -2619,7 +2619,6 @@ if test "x$GUITYPE" = "xGTK"; then
else else
AC_MSG_RESULT([usable.]) AC_MSG_RESULT([usable.])
AC_DEFINE(USE_GRESOURCE) AC_DEFINE(USE_GRESOURCE)
GRESOURCE_HDR="auto/gui_gtk_gresources.h"
GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o" GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi fi
@ -2631,7 +2630,6 @@ if test "x$GUITYPE" = "xGTK"; then
fi fi
fi fi
AC_SUBST(GLIB_COMPILE_RESOURCES) AC_SUBST(GLIB_COMPILE_RESOURCES)
AC_SUBST(GRESOURCE_HDR)
AC_SUBST(GRESOURCE_SRC) AC_SUBST(GRESOURCE_SRC)
AC_SUBST(GRESOURCE_OBJ) AC_SUBST(GRESOURCE_OBJ)

2
src/version.c
View File

@ -742,6 +742,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 */
/**/
1226,
/**/ /**/
1225, 1225,
/**/ /**/