From 8239357d4919047f4f8138857e26ce851f483f93 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 26 Oct 2016 10:42:51 +0100 Subject: Post-merge fix --- shell/ash.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index a7b65ffc7..d2bbde2f7 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -14510,7 +14510,6 @@ globals_var_size(struct globals_var *gvp) nodeptrsize += 2 + VTABSIZE; /* gvp->redirlist, gvp->shellparam.p, vartab */ } -#undef g_nullredirs #undef preverrout_fd static struct globals_var * globals_var_copy(struct globals_var *gvp) @@ -14530,7 +14529,6 @@ globals_var_copy(struct globals_var *gvp) new->redirlist = redirtab_copy(gvp->redirlist); SAVE_PTR(new->redirlist); - new->g_nullredirs = gvp->g_nullredirs; new->preverrout_fd = gvp->preverrout_fd; for (i = 0; i < VTABSIZE; i++) { new->vartab[i] = var_copy(gvp->vartab[i]); -- cgit v1.2.3-55-g6feb