From 39d9feb4387c856d3976d1e3827650839f572b59 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Sat, 19 Feb 2011 08:23:46 -0500
Subject: [PATCH] The howmany macro lives in sys/sysmacros.h on SVR5 systems
 Closes Bug 470

---
 config.h.in                  | 3 +++
 configure                    | 3 ++-
 configure.in                 | 2 +-
 plugins/sudoers/sudoreplay.c | 3 +++
 src/exec.c                   | 3 +++
 src/exec_pty.c               | 3 +++
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config.h.in b/config.h.in
index e0b52fa35..3050e0f5c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -525,6 +525,9 @@
 /* Define to 1 if you have the <sys/stropts.h> header file. */
 #undef HAVE_SYS_STROPTS_H
 
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#undef HAVE_SYS_SYSMACROS_H
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
diff --git a/configure b/configure
index 38764f7ec..f3460d50a 100755
--- a/configure
+++ b/configure
@@ -14041,7 +14041,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-for ac_header in malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h
+for ac_header in malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -20933,5 +20933,6 @@ fi
 
 
 
+
 
 
diff --git a/configure.in b/configure.in
index 8ca2c7acb..689bc9599 100644
--- a/configure.in
+++ b/configure.in
@@ -1897,7 +1897,7 @@ dnl
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
-AC_CHECK_HEADERS(malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h)
+AC_CHECK_HEADERS(malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h)
 dnl
 dnl Check for large file support.  HP-UX 11.23 has a broken sys/type.h
 dnl when large files support is enabled so work around it.
diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 6343030e3..81d72ae2f 100644
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -18,6 +18,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/src/exec.c b/src/exec.c
index 70345962a..a477f65d8 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -18,6 +18,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/exec_pty.c b/src/exec_pty.c
index 75410e3c0..a132924d2 100644
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -18,6 +18,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-- 
2.40.0