Changeset 10102

Timestamp:

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

Author:

rhl

Message:

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

Location:

trunk/psModules/src/detrend

Files:

• pmDetrendDB.c (modified) (2 diffs)
• psPipe.c (modified) (3 diffs)
• psPipe.h (modified) (2 diffs)

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -131 +131 @@
     }
 
-    status = psIOBufferReadEmpty (buffer, 100, pipe->stdout);
+    status = psIOBufferReadEmpty (buffer, 100, pipe->fd_stdout);
     if (!status) {
         psError (PS_ERR_IO, false, "detselect is not responding");
@@ -226 +226 @@
         goto failure;
     }
-    status = psIOBufferReadEmpty (buffer, 100, pipe->stdout);
+    status = psIOBufferReadEmpty (buffer, 100, pipe->fd_stdout);
     if (!status) {
         psError (PS_ERR_IO, false, "detselect is not responding");

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;

trunk/psModules/src/detrend/psPipe.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-10 01:01:09 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-20 17:50:17 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -20 +20 @@
 {
     int pid;
-    int stdin;
-    int stdout;
-    int stderr;
+    int fd_stdin;
+    int fd_stdout;
+    int fd_stderr;
 }
 psPipe;