--- ray/src/meta/sort.c 2003/06/16 14:54:54 1.5 +++ ray/src/meta/sort.c 2003/11/15 02:13:37 1.8 @@ -1,18 +1,16 @@ #ifndef lint -static const char RCSid[] = "$Id: sort.c,v 1.5 2003/06/16 14:54:54 greg Exp $"; +static const char RCSid[] = "$Id: sort.c,v 1.8 2003/11/15 02:13:37 schorsch Exp $"; #endif /* * Sorting routines for meta-files */ -#include "paths.h" +#include "platform.h" /* [_]snprintf() */ +#include "rtprocess.h" /* getpid() */ +#include "rterror.h" #include "meta.h" -#ifdef _WIN32 - #include /* getpid() */ -#endif - #define PBSIZE 1000 /* max size of sort block */ /* maxalloc must be >= this */ @@ -94,7 +92,7 @@ FILE *ofp /* output file */ { PRIMITIVE *plp; /* position in list */ PRIMITIVE *pp[NFILES]; /* input primitives */ - int minf; + int minf = 0; PRIMITIVE *minp; register int i; @@ -203,7 +201,6 @@ int (*pcmp)() { static int nf = 0, intree = FALSE; - FILE *fp; if (isglob(pl->pbot->com)) {