From e0f12d81a70c8916cf36d9a444a272a9aea74877 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Thu, 28 Apr 2016 15:09:46 -0600
Subject: [PATCH] Remove configure checks for dev_t, id_t, ino_t, ptrdiff_t,
 size_t and ssize_t.  These have been specified by either ANSI C or POSIX for
 long enough that if the system doesn't support them, it is unlikely to be
 able to compile sudo anyway.

---
 config.h.in  | 15 ------------
 configure    | 66 ----------------------------------------------------
 configure.ac |  6 -----
 3 files changed, 87 deletions(-)

diff --git a/config.h.in b/config.h.in
index b71d9cdb4..b3311e922 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1135,27 +1135,18 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef dev_t
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef errno_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef id_t
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef ino_t
-
 /* Define to `long long' if <sys/types.h> does not define. */
 #undef intmax_t
 
@@ -1165,9 +1156,6 @@
 /* Define to an OS-specific initialization function or `os_init_common'. */
 #undef os_init
 
-/* Define to `long' if <sys/types.h> does not define. */
-#undef ptrdiff_t
-
 /* Define to `size_t' if <sys/types.h> does not define. */
 #undef rsize_t
 
@@ -1180,9 +1168,6 @@
 /* Define to `unsigned int' if <sys/socket.h> doesn't define. */
 #undef socklen_t
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
diff --git a/configure b/configure
index 04cb26500..0a1a0b236 100755
--- a/configure
+++ b/configure
@@ -17484,72 +17484,6 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 if test X"$ac_cv_type_long_long_int" != X"yes"; then
     as_fn_error $? "\"C compiler does not appear to support the long long int type\"" "$LINENO" 5
 fi
-ac_fn_c_check_type "$LINENO" "id_t" "ac_cv_type_id_t" "$ac_includes_default"
-if test "x$ac_cv_type_id_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define id_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "dev_t" "ac_cv_type_dev_t" "$ac_includes_default"
-if test "x$ac_cv_type_dev_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define dev_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-if test "x$ac_cv_type_ino_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ino_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-fi
-
 ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "$ac_includes_default"
 if test "x$ac_cv_type_intmax_t" = xyes; then :
 
diff --git a/configure.ac b/configure.ac
index bb2ba2699..263b7aad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2328,12 +2328,6 @@ AC_TYPE_LONG_LONG_INT
 if test X"$ac_cv_type_long_long_int" != X"yes"; then
     AC_MSG_ERROR(["C compiler does not appear to support the long long int type"])
 fi
-AC_CHECK_TYPE(id_t, unsigned int)
-AC_CHECK_TYPE(size_t, unsigned int)
-AC_CHECK_TYPE(ssize_t, int)
-AC_CHECK_TYPE(dev_t, int)
-AC_CHECK_TYPE(ino_t, unsigned int)
-AC_CHECK_TYPE(ptrdiff_t, long)
 AC_CHECK_TYPE(intmax_t, long long)
 AC_CHECK_TYPE(uintmax_t, unsigned long long)
 AC_CHECK_TYPE(uint8_t, unsigned char)
-- 
2.40.0