From a5662d500a6e3d589dbd3702b06e7e6d3d38bccd Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Sat, 7 Oct 2017 14:54:00 -0700
Subject: [PATCH] Rename stdin/stdout/stderr to proc_*

Because we include stdio.h now, Solaris defines stdin, stdout, and
stderr in a way that they can't be used to name the args to the spawn
function.  Hence rename these args.
---
 src/lisp/runprog.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lisp/runprog.c b/src/lisp/runprog.c
index 61a9bb8df..a2a3153f0 100644
--- a/src/lisp/runprog.c
+++ b/src/lisp/runprog.c
@@ -16,7 +16,7 @@
 
 pid_t
 spawn(char *program, char *argv[], char *envp[], char *pty_name,
-      int stdin, int stdout, int stderr)
+      int proc_stdin, int proc_stdout, int proc_stderr)
 {
     pid_t pid;
     sigset_t set;
@@ -51,12 +51,12 @@ spawn(char *program, char *argv[], char *envp[], char *pty_name,
     }
 
     /* Set up stdin, stdout, and stderr. */
-    if (stdin >= 0)
-	dup2(stdin, 0);
-    if (stdout >= 0)
-	dup2(stdout, 1);
-    if (stderr >= 0)
-	dup2(stderr, 2);
+    if (proc_stdin >= 0)
+	dup2(proc_stdin, 0);
+    if (proc_stdout >= 0)
+	dup2(proc_stdout, 1);
+    if (proc_stderr >= 0)
+	dup2(proc_stderr, 2);
 
     /* Close all other fds. */
     for (fd = sysconf(_SC_OPEN_MAX) - 1; fd >= 3; fd--)
-- 
GitLab