ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rcomb.c

Comparing ray/src/util/rcomb.c (file contents):
Revision 2.23 by greg, Fri Jun 7 03:55:59 2024 UTC vs.
Revision 2.24 by greg, Mon Jun 10 18:20:06 2024 UTC

#	Line 488 | Line 488 | initialize(RMATRIX *imp)
488		restype = mop[i].rmp->dtype;
489		if (!imp->dtype || (restype = rmx_newtype(restype, imp->dtype)) > 0)
490		imp->dtype = restype;
491	<	else
491	>	else if (!nowarn)
492		fprintf(stderr, "%s: warning - data type mismatch\n",
493		mop[i].inspec);
494		if (!i) {
#	Line 552 | Line 552 | spawned_children(int np)
552
553		#if defined(_WIN32) || defined(_WIN64)
554		if (np > 1) {
555	<	fputs("Warning: only one process under Windows\n", stderr);
555	>	if (!nowarn)
556	>	fputs("Warning: only one process under Windows\n", stderr);
557		np = 1;
558		} else
559		#endif
#	Line 689 | Line 690 | parent_loop(void)
690		i = close_processes(cproc, nchildren);  /* collect family */
691		free(cproc); cproc = NULL; nchildren = 0;
692		if (i < 0) {
693	<	fputs("Warning: lost child in parent_loop()\n", stderr);
693	>	if (!nowarn)
694	>	fputs("Warning: lost child in parent_loop()\n", stderr);
695		return(1);
696		}
697		if (i > 0) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)