From 1d2f684c9b96cbf9d9e79b8f453c8e52f5c2198e Mon Sep 17 00:00:00 2001
From: Peter Stephenson <p.stephenson@samsung.com>
Date: Thu, 17 May 2018 10:00:37 +0100
Subject: 42793: Always define FDT_PROC_SUBST even if not needed.

This avoids proliferating #ifdef's.
---
 Src/jobs.c | 6 +-----
 Src/zsh.h  | 5 ++---
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'Src')

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.
  */
-- 
cgit 1.4.1