diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-01 11:50:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-01 11:50:09 +0100 |
| commit | 3954e3c4b5d2bfda4c481c076fbc39ab06be7639 (patch) | |
| tree | 62a82a908bf72e13ed8f7d0377346a0501a4264f | |
| parent | e3caa1109072b9655f8d5103c92efd73177f8577 (diff) | |
patch 8.0.0276: unnecessary #ifdefsv8.0.0276
Problem: Checking for FEAT_GUI_GNOME inside GTK 3 code is unnecessary.
Solution: Remove the #ifdef. (Kazunobu Kuriyama)
| -rw-r--r-- | src/gui_gtk_x11.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 8781e2c347..eef0bd4277 100644 --- 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 d8b82a87a9..8aeb688a09 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 276, +/**/ 275, /**/ 274, |