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

Comparing ray/src/rt/oocsort.c (file contents):
Revision 2.3 by rschregle, Tue May 17 17:39:47 2016 UTC vs.
Revision 2.5 by rschregle, Wed Feb 10 21:48:50 2021 UTC

# Line 1 | Line 1
1 + #ifndef lint
2 + static const char RCSid[] = "$Id$";
3 + #endif
4 +
5 +
6   /*
7     =========================================================================
8     N-way out-of-core merge sort for records with 3D keys.  Recursively
# Line 14 | Line 19
19   */
20  
21  
22 + #if !defined(_WIN32) && !defined(_WIN64) || defined(PMAP_OOC)
23 + /* No Windoze support for now */
24  
25   #include "oocsort.h"
26   #include "oocmorton.h"
# Line 24 | Line 31
31   #include <sys/wait.h>
32  
33  
27 –
34   /* Priority queue node */
35   typedef struct {
36     OOC_MortonIdx     pri;        /* Record's priority (sort key) */
# Line 326 | Line 332 | static int OOC_SortRecurse (FILE *in, unsigned long bl
332                 exit(0);
333              }
334              else if (pid < 0) {
335 <               fprintf(stderr, "OOC_Sort: failed to fork subprocess\n");
335 >               perror("OOC_Sort: failed to fork subprocess");
336                 return -1;
337              }
338  
# Line 571 | Line 577 | int OOC_Sort (FILE *in, FILE *out, unsigned numBlk,
577    
578     return stat;          
579   }
580 +
581 + #endif /* NIX / PMAP_OOC */

Diff Legend

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