--- ray/src/util/rcollate.c 2013/09/06 21:43:29 2.5 +++ ray/src/util/rcollate.c 2013/11/18 22:02:12 2.7 @@ -1,18 +1,22 @@ #ifndef lint -static const char RCSid[] = "$Id: rcollate.c,v 2.5 2013/09/06 21:43:29 greg Exp $"; +static const char RCSid[] = "$Id: rcollate.c,v 2.7 2013/11/18 22:02:12 greg Exp $"; #endif /* * Utility to re-order records in a binary or ASCII data file (matrix) */ #include -#include #include #include #include "platform.h" #include "rtio.h" #include "resolu.h" -#ifndef _WIN32 +#ifdef _WIN32 +#undef ftello +#define ftello ftell +#undef ssize_t +#define ssize_t size_t +#else #include #endif