Merge from gnulib

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 03160340c8e..ade4ff8ebdb 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -591,6 +591,7 @@ HAVE_OPENAT = @HAVE_OPENAT@
 HAVE_OPENDIR = @HAVE_OPENDIR@
 HAVE_OS_H = @HAVE_OS_H@
 HAVE_PCLOSE = @HAVE_PCLOSE@
+HAVE_PDUMPER = @HAVE_PDUMPER@
 HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
 HAVE_POPEN = @HAVE_POPEN@
diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index 9155e6b5607..7078c34bdc7 100644
--- a/lib/str-two-way.h
+++ b/lib/str-two-way.h
@@ -18,7 +18,7 @@
 
 /* Before including this file, you need to include <config.h> and
    <string.h>, and define:
-     RESULT_TYPE             A macro that expands to the return type.
+     RETURN_TYPE             A macro that expands to the return type.
      AVAILABLE(h, h_l, j, n_l)
                              A macro that returns nonzero if there are
                              at least N_L bytes left starting at H[J].