* subshell.c: Use standard Autoconf symbols to determine whether

to include <stropts.h> and <grp.h>.

src/ChangeLog

@@ -1,3 +1,8 @@
+2001-08-24  Pavel Roskin  <proski@gnu.org>
+
+	* subshell.c: Use standard Autoconf symbols to determine whether
+	to include <stropts.h> and <grp.h>.
+
 2001-08-23  Pavel Roskin  <proski@gnu.org>
 
 	* subshell.c (feed_subshell): Don't wait forever after the first

src/subshell.c

@@ -66,15 +66,13 @@
 #   define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
 
-#ifdef HAVE_GRANTPT
+#ifdef HAVE_STROPTS_H
-#   include <stropts.h> /* For I_PUSH			      */
+#   include <stropts.h> /* For I_PUSH */
-#else
+#endif /* HAVE_STROPTS_H */
-#   include <grp.h>	/* For the group struct & getgrnam()  */
-#endif
 
-#ifdef SCO_FLAVOR
+#ifdef HAVE_GRP_H
 #   include <grp.h>	/* For the group struct & getgrnam()  */
-#endif /* SCO_FLAVOR */
+#endif /* HAVE_GRP_H */
 
 #ifdef __QNX__
 #   include <unix.h>	/* exec*() from <process.h> */