From 00a2b689b36d9e8680f5360da991d770b634092a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 27 Jan 2017 09:31:40 +0000
Subject: [PATCH] Revert "errnostring: Handle changed type of 'len' parameter
 in gperf 3.1 (RHBZ#1416941)."

This reverts commit 3a2b89a09ea12db7c55b07cb9e95cdf09b5b845b.
---
 generator/errnostring.ml |  2 +-
 m4/guestfs_progs.m4      | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/generator/errnostring.ml b/generator/errnostring.ml
index 4a544f337..d16a07ecd 100644
--- a/generator/errnostring.ml
+++ b/generator/errnostring.ml
@@ -231,7 +231,7 @@ extern int guestfs_int_string_to_errno (const char *errnostr);
 
 /* Private structure and function used by the perfect hash implementation. */
 struct errnostring_entry { char *name; int errnum; };
-extern const struct errnostring_entry *guestfs_int_string_to_errno_lookup (register const char *str, register GPERF_SIZE_T len);
+extern const struct errnostring_entry *guestfs_int_string_to_errno_lookup (register const char *str, register unsigned int len);
 
 #endif /* GUESTFS_ERRNOSTRING_H_ */
 "
diff --git a/m4/guestfs_progs.m4 b/m4/guestfs_progs.m4
index 198598cae..c63e62f09 100644
--- a/m4/guestfs_progs.m4
+++ b/m4/guestfs_progs.m4
@@ -50,26 +50,6 @@ AC_CHECK_PROG([GPERF],[gperf],[gperf],[no])
 test "x$GPERF" = "xno" &&
     AC_MSG_ERROR([gperf must be installed])
 
-dnl Determine type of gperf hash function (changed in gperf 3.1).
-AC_MSG_CHECKING([type of gperf hash len parameter])
-cat > conftest.gperf <<EOF
-%language=ANSI-C
-%%
-A, 1
-%%
-EOF
-GPERF_SIZE_T=$(
-    $GPERF conftest.gperf |
-    grep '^hash (.*len)$' |
-    $SED 's/.*, register \([[^,]]*\) len)$/\1/'
-)
-if test "x$GPERF_SIZE_T" = "x"; then
-    AC_MSG_ERROR([could not detect type of gperf hash len parameter])
-fi
-AC_MSG_RESULT([$GPERF_SIZE_T])
-AC_DEFINE_UNQUOTED([GPERF_SIZE_T],[$GPERF_SIZE_T],[Type of gperf hash len parameter.])
-rm conftest.gperf
-
 dnl Check for genisoimage/mkisofs
 AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no],
     [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])