diff options
| author | Peter Stephenson <p.stephenson@samsung.com> | 2018-05-17 10:00:37 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.stephenson@samsung.com> | 2018-05-17 10:00:37 +0100 |
| commit | 1d2f684c9b96cbf9d9e79b8f453c8e52f5c2198e (patch) | |
| tree | 82ed721d57915f4560ef742beb1cd4ab4b26b6af | |
| parent | ee7dda7806db51016f9fe8d84f7ac3edb594eff0 (diff) | |
| download | zsh-1d2f684c9b96cbf9d9e79b8f453c8e52f5c2198e.tar.gz zsh-1d2f684c9b96cbf9d9e79b8f453c8e52f5c2198e.tar.xz zsh-1d2f684c9b96cbf9d9e79b8f453c8e52f5c2198e.zip | |
42793: Always define FDT_PROC_SUBST even if not needed.
This avoids proliferating #ifdef's.
| -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
diff --git a/ChangeLog b/ChangeLog index e6e1427f0..d6f10e6b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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); diff --git a/Src/zsh.h b/Src/zsh.h index 8b4898477..8535d48fb 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -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. */ |