Skip to content

Commit 3803bad

Browse files
committed
patch 7.4.1226
Problem: GRESOURCE_HDR is unused. Solution: Remove it. (Kazunobu Kuriyama)
1 parent d14e00e commit 3803bad

4 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/auto/configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,6 @@ NARROW_PROTO
638638
MOTIF_LIBNAME
639639
GRESOURCE_OBJ
640640
GRESOURCE_SRC
641-
GRESOURCE_HDR
642641
GLIB_COMPILE_RESOURCES
643642
GNOME_INCLUDEDIR
644643
GNOME_LIBDIR
@@ -9107,7 +9106,6 @@ $as_echo "cannot be found in PATH." >&6; }
91079106
$as_echo "usable." >&6; }
91089107
$as_echo "#define USE_GRESOURCE 1" >>confdefs.h
91099108

9110-
GRESOURCE_HDR="auto/gui_gtk_gresources.h"
91119109
GRESOURCE_SRC="auto/gui_gtk_gresources.c"
91129110
GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
91139111
fi
@@ -9125,7 +9123,6 @@ fi
91259123

91269124

91279125

9128-
91299126
if test -z "$SKIP_MOTIF"; then
91309127
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"
91319128
GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"

src/config.mk.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ MOTIF_LIBNAME = @MOTIF_LIBNAME@
161161
GTK_LIBNAME = @GTK_LIBNAME@
162162

163163
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
164-
GRESOURCE_HDR = @GRESOURCE_HDR@
165164
GRESOURCE_SRC = @GRESOURCE_SRC@
166165
GRESOURCE_OBJ = @GRESOURCE_OBJ@
167166

src/configure.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,7 +2619,6 @@ if test "x$GUITYPE" = "xGTK"; then
26192619
else
26202620
AC_MSG_RESULT([usable.])
26212621
AC_DEFINE(USE_GRESOURCE)
2622-
GRESOURCE_HDR="auto/gui_gtk_gresources.h"
26232622
GRESOURCE_SRC="auto/gui_gtk_gresources.c"
26242623
GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
26252624
fi
@@ -2631,7 +2630,6 @@ if test "x$GUITYPE" = "xGTK"; then
26312630
fi
26322631
fi
26332632
AC_SUBST(GLIB_COMPILE_RESOURCES)
2634-
AC_SUBST(GRESOURCE_HDR)
26352633
AC_SUBST(GRESOURCE_SRC)
26362634
AC_SUBST(GRESOURCE_OBJ)
26372635

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
1226,
745747
/**/
746748
1225,
747749
/**/

0 commit comments

Comments
 (0)