patch 8.0.0276: unnecessary #ifdefs

Problem:    Checking for FEAT_GUI_GNOME inside GTK 3 code is unnecessary.
Solution:   Remove the #ifdef. (Kazunobu Kuriyama)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8781e2c347169a42aa2c1790d9bfad91353483ed..eef0bd42778e12d25c926fe8c46c0e4e5be593f0 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3212,15 +3212,7 @@ get_item_dimensions(GtkWidget *widget, GtkOrientation orientation)
        GtkAllocation allocation;
 
        gtk_widget_get_allocation(widget, &allocation);
-
-#  ifdef FEAT_GUI_GNOME
-       if (orientation == GTK_ORIENTATION_HORIZONTAL)
-           return allocation.height;
-       else
-           return allocation.width;
-#  else
        return allocation.height;
-#endif
 # else
 #  ifdef FEAT_GUI_GNOME
        if (orientation == GTK_ORIENTATION_HORIZONTAL)

diff --git a/src/version.c b/src/version.c
index d8b82a87a9e05e828190f2b321c1f4612848d5f8..8aeb688a09c0892ac72fd6e77aca94888ee85d9c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    276,
 /**/
     275,
 /**/