summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-09 20:30:27 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-09 20:30:27 +0100
commit009c7b2640b6e04c101118cc7d0dc5785f9aa116 (patch)
tree65e721f6f3a46df62c13d45e328cdf95ac8ed456
parent4d0504019cc744a5122821f187dd3adfe536afff (diff)
downloadvim-git-009c7b2640b6e04c101118cc7d0dc5785f9aa116.tar.gz
patch 8.0.0162: build error on Fedora 23v8.0.0162
Problem: Build error on Fedora 23 with small features and gnome2. Solution: Undefine ngettext(). (Hirohito Higashi)
-rw-r--r--src/gui_gtk.c3
-rw-r--r--src/gui_gtk_x11.c3
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 8686381b0..c015d7ee6 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -51,6 +51,9 @@
# ifdef _
# undef _
# endif
+# ifdef ngettext
+# undef ngettext
+# endif
# ifdef N_
# undef N_
# endif
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 514ac9e31..71bcd6a3a 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -35,6 +35,9 @@
# ifdef _
# undef _
# endif
+# ifdef ngettext
+# undef ngettext
+# endif
# ifdef N_
# undef N_
# endif
diff --git a/src/version.c b/src/version.c
index 7f52cab80..1c4c57bb9 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 */
/**/
+ 162,
+/**/
161,
/**/
160,