Changeset 10102 for trunk/psModules/src/detrend/psPipe.c

Timestamp:

Nov 20, 2006, 7:50:17 AM (19 years ago)

Author:

rhl

Message:

std{in,out,err} are reserved macros in stdio.h

File:

• trunk/psModules/src/detrend/psPipe.c (modified) (3 diffs)

trunk/psModules/src/detrend/psPipe.c

@@ -40 +40 @@
     psMemSetDeallocator(pipe, (psFreeFunc) psPipeFree);
 
-    pipe->stdin  = 0;
-    pipe->stdout = 0;
-    pipe->stderr = 0;
+    pipe->fd_stdin  = 0;
+    pipe->fd_stdout = 0;
+    pipe->fd_stderr = 0;
     return (pipe);
 }
@@ -134 +134 @@
 
     pipe->pid    = pid;
-    pipe->stdin  = stdin_fd[1];
-    pipe->stdout = stdout_fd[0];
-    pipe->stderr = stderr_fd[0];
+    pipe->fd_stdin  = stdin_fd[1];
+    pipe->fd_stdout = stdout_fd[0];
+    pipe->fd_stderr = stderr_fd[0];
 
     return (pipe);
@@ -153 +153 @@
 
     close_status = true;
-    if (close (pipe->stdin) != 0) {
+    if (close (pipe->fd_stdin) != 0) {
         psError(PS_ERR_IO, true, "error closing the pipe stdin (pid %d, error %s)\n", pipe->pid, strerror(errno));
         close_status = false;
     }
-    if (close (pipe->stdout) != 0) {
+    if (close (pipe->fd_stdout) != 0) {
         psError(PS_ERR_IO, true, "error closing the pipe stdout (pid %d, error %s)\n", pipe->pid, strerror(errno));
         close_status = false;
     }
-    if (close (pipe->stderr) != 0) {
+    if (close (pipe->fd_stderr) != 0) {
         psError(PS_ERR_IO, true, "error closing the pipe sterr (pid %d, error %s)\n", pipe->pid, strerror(errno));
         close_status = false;