From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 19 Feb 2011 13:19:35 +0000 (-0500)
Subject: The howmany macro lives in sys/sysmacros.h on SVR5 systems
X-Git-Tag: SUDO_1_7_5~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c08cbe47a2395d3a0fccab444a77b32249ab74a2;p=sudo

The howmany macro lives in sys/sysmacros.h on SVR5 systems
Closes Bug 470

--HG--
branch : 1.7
---

diff --git a/config.h.in b/config.h.in
index 2a7f22d3b..a4b000db0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -546,6 +546,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 d64d12949..3abc212a0 100755
--- a/configure
+++ b/configure
@@ -14086,7 +14086,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"
diff --git a/configure.in b/configure.in
index 3eac9dabb..b8e35b354 100644
--- a/configure.in
+++ b/configure.in
@@ -1898,7 +1898,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/exec.c b/exec.c
index 65a3abefb..af54d30ad 100644
--- a/exec.c
+++ b/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/exec_pty.c b/exec_pty.c
index 7677e9236..cca9f880b 100644
--- a/exec_pty.c
+++ b/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>
diff --git a/sudoreplay.c b/sudoreplay.c
index 12fcd1209..1232cea74 100644
--- a/sudoreplay.c
+++ b/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>