ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rad.c
(Generate patch)

Comparing ray/src/util/rad.c (file contents):
Revision 2.79 by greg, Mon Oct 4 04:42:33 2004 UTC vs.
Revision 2.81 by schorsch, Mon Sep 12 14:40:13 2005 UTC

# Line 1145 | Line 1145 | myprintview(                   /* print out selected view */
1145          VIEW    vwr;
1146          char    buf[128];
1147          register char   *cp;
1148 + #ifdef _WIN32
1149 + /* XXX Should we allow something like this for all platforms? */
1150 + /* XXX Or is it still required at all? */
1151 + again:
1152 + #endif
1153          if (vopts == NULL)
1154                  return(-1);
1155   #ifdef _WIN32
# Line 1360 | Line 1365 | rpict(                         /* run rpict and pfilt for each view */
1365          }
1366          wait_process(1);                /* wait for children to finish */
1367          if (pfile != NULL) {            /* clean up rpict persistent mode */
1368 <                int     pid;
1368 >                RT_PID  pid;
1369                  fp = fopen(pfile, "r");
1370                  if (fp != NULL) {
1371                          if (fscanf(fp, "%*s %d", &pid) != 1 ||
# Line 1439 | Line 1444 | mvfile(                /* move a file */
1444   static int
1445   next_process(void)                      /* fork the next process (max. nprocs) */
1446   {
1447 <        int     child_pid;
1447 >        RT_PID  child_pid;
1448  
1449          if (nprocs <= 1)
1450                  return(0);              /* it's us or no one */
# Line 1470 | Line 1475 | wait_process(                  /* wait for process(es) to finish */
1475   )
1476   {
1477          int     ourstatus = 0;
1478 <        int     pid, status;
1478 >        RT_PID  pid, status;
1479  
1480          if (all)
1481                  all = children_running;
# Line 1507 | Line 1512 | int    all;
1512   }
1513   int
1514   kill(pid, sig) /* win|unix_process.c should also wait and kill */
1515 < int pid, sig;
1515 > RT_PID pid, sig;
1516   {
1517          return 0;
1518   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines