From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17985 invoked from network); 28 Feb 2000 04:34:25 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 28 Feb 2000 04:34:25 -0000 Received: (qmail 15577 invoked by alias); 28 Feb 2000 04:34:18 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 9889 Received: (qmail 15567 invoked from network); 28 Feb 2000 04:34:16 -0000 From: "Bart Schaefer" Message-Id: <1000228043349.ZM7849@candle.brasslantern.com> Date: Mon, 28 Feb 2000 04:33:49 +0000 X-Mailer: Z-Mail (5.0.0 30July97) To: zsh-workers@sunsite.auc.dk Subject: PATCH: Detect prototype for mknod() MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii This is part of the 3.0.7 to 3.0.8 patch, which should be applied to 3.1.6. The exec.c hunks just fix a typo and reset xtrerr a bit sooner (paranoia). Index: acconfig.h =================================================================== @@ -207,6 +207,9 @@ /* Define to 1 if there is a prototype defined for ioctl() on your system */ #undef HAVE_IOCTL_PROTO +/* Define to 1 if there is a prototype defined for mknod() on your system */ +#undef HAVE_MKNOD_PROTO + /* Define to 1 if select() is defined in , ie BeOS R4.51*/ #undef SELECT_IN_SYS_SOCKET_H Index: configure.in =================================================================== @@ -1086,9 +1086,9 @@ AC_DEFINE(HAVE_SBRK_PROTO) fi -dnl ------------------------ -dnl ioctl prototypes for OSF -dnl ------------------------ +dnl ---------------------------------- +dnl ioctl and mknod prototypes for OSF +dnl ---------------------------------- if test "$ac_cv_prog_cc_stdc" != no; then AC_CACHE_CHECK(for ioctl prototype in , @@ -1099,6 +1099,15 @@ zsh_cv_header_sys_ioctl_h_ioctl_proto=yes)]) if test $zsh_cv_header_sys_ioctl_h_ioctl_proto = yes; then AC_DEFINE(HAVE_IOCTL_PROTO) + fi + AC_CACHE_CHECK(for mknod prototype in , + zsh_cv_header_sys_stat_h_mknod_proto, + [AC_TRY_COMPILE([#include + int mknod(double x);], [int i;], + zsh_cv_header_sys_stat_h_mknod_proto=no, + zsh_cv_header_sys_stat_h_mknod_proto=yes)]) + if test $zsh_cv_header_sys_stat_h_mknod_proto = yes; then + AC_DEFINE(HAVE_MKNOD_PROTO) fi fi Index: Src/exec.c =================================================================== @@ -1278,7 +1278,7 @@ } } -/* Open a file for writing redicection */ +/* Open a file for writing redirection */ /**/ static int @@ -2311,8 +2311,8 @@ if (xtrerr != stderr) { fil = fileno(xtrerr); fclose(xtrerr); - zclose(fil); xtrerr = stderr; + zclose(fil); } } Index: Src/prototypes.h =================================================================== @@ -66,7 +66,9 @@ # ifndef HAVE_IOCTL_PROTO int ioctl _((int d, unsigned long request, void *argp)); # endif +# ifndef HAVE_MKNOD_PROTO int mknod _((const char *pathname, int mode, dev_t device)); +# endif int nice _((int increment)); int select _((int nfds, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, struct timeval *timeout)); #endif -- Bart Schaefer Brass Lantern Enterprises http://www.well.com/user/barts http://www.brasslantern.com