Index: /trunk/Ohana/src/opihi/include/pcontrol.h
===================================================================
--- /trunk/Ohana/src/opihi/include/pcontrol.h	(revision 28241)
+++ /trunk/Ohana/src/opihi/include/pcontrol.h	(revision 28242)
@@ -120,6 +120,6 @@
   JobStat      state;
   JobStat      stack;
-  JobOutput    stdout;
-  JobOutput    stderr;
+  JobOutput    stdout_buf;
+  JobOutput    stderr_buf;
   Ptime        start;
   Ptime        stop;
Index: /trunk/Ohana/src/opihi/pcontrol/CheckBusyJob.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/CheckBusyJob.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/CheckBusyJob.c	(revision 28242)
@@ -94,11 +94,11 @@
   sscanf (p, "%*s %d", &job[0].exit_status);
   p = memstr (buffer[0].buffer, "STDOUT", buffer[0].Nbuffer);
-  sscanf (p, "%*s %d", &job[0].stdout.size);
+  sscanf (p, "%*s %d", &job[0].stdout_buf.size);
   p = memstr (buffer[0].buffer, "STDERR", buffer[0].Nbuffer);
-  sscanf (p, "%*s %d", &job[0].stderr.size);
+  sscanf (p, "%*s %d", &job[0].stderr_buf.size);
 
   // XXX runaway job if output too large?
-  if (job[0].stdout.size > 0x1000000) abort();
-  if (job[0].stderr.size > 0x1000000) abort();
+  if (job[0].stdout_buf.size > 0x1000000) abort();
+  if (job[0].stderr_buf.size > 0x1000000) abort();
 
   // job has exited : move to DONE stack 
Index: /trunk/Ohana/src/opihi/pcontrol/CheckDoneJob.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/CheckDoneJob.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/CheckDoneJob.c	(revision 28242)
@@ -19,10 +19,10 @@
 
   // we can always call this for stdout (if it is done, this is a NOP)
-  status1 = GetJobOutput ("stdout", host, &job[0].stdout);
+  status1 = GetJobOutput ("stdout", host, &job[0].stdout_buf);
 
   // we cannot try stderr until stdout is completed
   status2 = PCLIENT_HUNG;
-  if (job[0].stdout.completed) {
-      status2 = GetJobOutput ("stderr", host, &job[0].stderr);
+  if (job[0].stdout_buf.completed) {
+      status2 = GetJobOutput ("stderr", host, &job[0].stderr_buf);
   }
 
Index: /trunk/Ohana/src/opihi/pcontrol/JobOps.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 28242)
@@ -216,6 +216,6 @@
   job[0].Reset    = FALSE;
 
-  InitJobOutput (&job[0].stdout);
-  InitJobOutput (&job[0].stderr);
+  InitJobOutput (&job[0].stdout_buf);
+  InitJobOutput (&job[0].stderr_buf);
 
   job[0].mode     = mode;
@@ -257,6 +257,6 @@
   FREE (job[0].argv);
 
-  FreeIOBuffer (&job[0].stdout.buffer);
-  FreeIOBuffer (&job[0].stderr.buffer);
+  FreeIOBuffer (&job[0].stdout_buf.buffer);
+  FreeIOBuffer (&job[0].stderr_buf.buffer);
 
   FREE (job);
Index: /trunk/Ohana/src/opihi/pcontrol/StartJob.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/StartJob.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/StartJob.c	(revision 28242)
@@ -13,6 +13,6 @@
   ASSERT (job  == (Job *) host[0].job, "invalid job");
 
-  ResetJobOutput (&job[0].stdout);
-  ResetJobOutput (&job[0].stderr);
+  ResetJobOutput (&job[0].stdout_buf);
+  ResetJobOutput (&job[0].stderr_buf);
 
   /* construct command line : job arg0 arg1 ... argN\n */
Index: /trunk/Ohana/src/opihi/pcontrol/check.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/check.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/check.c	(revision 28242)
@@ -38,6 +38,6 @@
     gprint (GP_LOG, "STATUS %s\n", GetJobStackName(job[0].stack));
     gprint (GP_LOG, "EXITST %d\n", job[0].exit_status);
-    gprint (GP_LOG, "STDOUT %d\n", job[0].stdout.size);
-    gprint (GP_LOG, "STDERR %d\n", job[0].stderr.size);
+    gprint (GP_LOG, "STDOUT %d\n", job[0].stdout_buf.size);
+    gprint (GP_LOG, "STDERR %d\n", job[0].stderr_buf.size);
     gprint (GP_LOG, "DTIME %lf\n", job[0].dtime);
     if (job[0].realhost) {
@@ -50,6 +50,6 @@
 	set_str_variable ("JOB_STATUS", GetJobStackName(job[0].stack));
 	set_int_variable ("JOB_EXITST", job[0].exit_status);
-	set_int_variable ("JOB_STDOUT_SIZE", job[0].stdout.size);
-	set_int_variable ("JOB_STDERR_SIZE", job[0].stderr.size);
+	set_int_variable ("JOB_STDOUT_SIZE", job[0].stdout_buf.size);
+	set_int_variable ("JOB_STDERR_SIZE", job[0].stderr_buf.size);
 	set_variable ("JOB_DTIME", job[0].dtime);
 	set_str_variable ("JOB_HOSTNAME", job[0].hostname);
Index: /trunk/Ohana/src/opihi/pcontrol/stdout.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/stdout.c	(revision 28241)
+++ /trunk/Ohana/src/opihi/pcontrol/stdout.c	(revision 28242)
@@ -43,5 +43,5 @@
 
 found_stdout:
-  buffer = &job[0].stdout.buffer;
+  buffer = &job[0].stdout_buf.buffer;
   if (varName == NULL) {
     fwrite (buffer[0].buffer, 1, buffer[0].Nbuffer, stdout);
@@ -97,5 +97,5 @@
 
 found_stderr:
-  buffer = &job[0].stderr.buffer;
+  buffer = &job[0].stderr_buf.buffer;
   if (varName == NULL) {
     fwrite (buffer[0].buffer, 1, buffer[0].Nbuffer, stdout);