patch 8.0.0162: build error on Fedora 23

Problem:    Build error on Fedora 23 with small features and gnome2.
Solution:   Undefine ngettext(). (Hirohito Higashi)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 8686381b0e504e80d0c20b956da9d8aeb916c5ae..c015d7ee66cabeef5554bdbe695c29c32a713f0b 100644 (file)
--- 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 514ac9e31a481e8b823903af74f69a198eebaaa5..71bcd6a3a66ebc35fec8cfb0e4eb1a5b78941746 100644 (file)
--- 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 7f52cab802e3d645843032dc7f68cc18a3d84e18..1c4c57bb9ba988ca1626969073cf923489fbbbe4 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 */
+/**/
+    162,
 /**/
     161,
 /**/