diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/jobs.c | 6 | ||||
| -rw-r--r-- | Src/zsh.h | 5 |
3 files changed, 6 insertions, 8 deletions
@@ -1,5 +1,8 @@ 2018-05-17 Peter Stephenson <p.stephenson@samsung.com> + * 42793: Src/jobs.c, Src/zsh.h: Always define FDT_PROC_SUBST to + avoid proliferating #ifdef's. + * 42785: Src/builtins.c: redefining a user math function should silently work as with redefining other shell objects. diff --git a/Src/jobs.c b/Src/jobs.c index 330ee6b37..38b3d896b 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -1258,11 +1258,7 @@ pipecleanfilelist(LinkList filelist, int proc_subst_only) while (node) { Jobfile jf = (Jobfile)getdata(node); if (jf->is_fd && - (!proc_subst_only -#ifdef FDT_PROC_SUBST - || fdtable[jf->u.fd] == FDT_PROC_SUBST -#endif - )) { + (!proc_subst_only || fdtable[jf->u.fd] == FDT_PROC_SUBST)) { LinkNode next = nextnode(node); zclose(jf->u.fd); (void)remnode(filelist, node); @@ -454,15 +454,14 @@ enum { * so the shell can still exec the last process. */ #define FDT_FLOCK_EXEC 6 -#ifdef PATH_DEV_FD /* * Entry used by a process substition. * This marker is not tested internally as we associated the file * descriptor with a job for closing. + * + * This is not used unless PATH_DEV_FD is defined. */ #define FDT_PROC_SUBST 7 -#endif - /* * Mask to get the basic FDT type. */ |