--- ray/src/util/rad.c 2004/09/17 21:43:50 2.78 +++ ray/src/util/rad.c 2005/09/12 14:40:13 2.81 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad.c,v 2.78 2004/09/17 21:43:50 greg Exp $"; +static const char RCSid[] = "$Id: rad.c,v 2.81 2005/09/12 14:40:13 schorsch Exp $"; #endif /* * Executive program for oconv, rpict and pfilt @@ -1145,6 +1145,11 @@ myprintview( /* print out selected view */ VIEW vwr; char buf[128]; register char *cp; +#ifdef _WIN32 +/* XXX Should we allow something like this for all platforms? */ +/* XXX Or is it still required at all? */ +again: +#endif if (vopts == NULL) return(-1); #ifdef _WIN32 @@ -1315,8 +1320,10 @@ rpict( /* run rpict and pfilt for each view */ zopt, oct1name, rawfile); if (pfile != NULL && inchild()) { /* rpict persistent mode */ - if (!silent) + if (!silent) { printf("\t%s\n", combuf); + fflush(stdout); + } sprintf(combuf, "rpict%s %s %s%s%s %s > %s", rep, rppopt, res, po, opts, oct1name, rawfile); @@ -1358,7 +1365,7 @@ rpict( /* run rpict and pfilt for each view */ } wait_process(1); /* wait for children to finish */ if (pfile != NULL) { /* clean up rpict persistent mode */ - int pid; + RT_PID pid; fp = fopen(pfile, "r"); if (fp != NULL) { if (fscanf(fp, "%*s %d", &pid) != 1 || @@ -1437,7 +1444,7 @@ mvfile( /* move a file */ static int next_process(void) /* fork the next process (max. nprocs) */ { - int child_pid; + RT_PID child_pid; if (nprocs <= 1) return(0); /* it's us or no one */ @@ -1468,7 +1475,7 @@ wait_process( /* wait for process(es) to finish */ ) { int ourstatus = 0; - int pid, status; + RT_PID pid, status; if (all) all = children_running; @@ -1505,7 +1512,7 @@ int all; } int kill(pid, sig) /* win|unix_process.c should also wait and kill */ -int pid, sig; +RT_PID pid, sig; { return 0; }