--- ray/src/util/rcollate.c	2015/06/16 19:06:29	2.20
+++ ray/src/util/rcollate.c	2016/03/06 01:13:18	2.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcollate.c,v 2.20 2015/06/16 19:06:29 greg Exp $";
+static const char RCSid[] = "$Id: rcollate.c,v 2.23 2016/03/06 01:13:18 schorsch Exp $";
 #endif
 /*
  * Utility to re-order records in a binary or ASCII data file (matrix)
@@ -11,22 +11,15 @@ static const char RCSid[] = "$Id: rcollate.c,v 2.20 20
 #include "platform.h"
 #include "rtio.h"
 #include "resolu.h"
-#ifdef _WIN32
-#undef ftello
-#define	ftello	ftell
-#undef ssize_t
-#define ssize_t	size_t
+#if defined(_WIN32) || defined(_WIN64)
+  #undef ftello
+  #define	ftello	ftell
+  #undef ssize_t
+  #define ssize_t	size_t
 #else
-#include <sys/mman.h>
+  #include <sys/mman.h>
 #endif
 
-#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
-#undef getc
-#undef putc
-#define getc    getc_unlocked
-#define putc    putc_unlocked
-#endif
-
 typedef struct {
 	void	*base;		/* pointer to base memory */
 	size_t	len;		/* allocated memory length */
@@ -74,7 +67,7 @@ load_stream(MEMLOAD *mp, FILE *fp)
 		return(-1);
 	while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
 		if (!alloced)
-			mp->base = malloc(nr);
+			mp->base = malloc(alloced = nr);
 		else if (mp->len+nr > alloced)
 			mp->base = realloc(mp->base,
 				alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);
@@ -99,7 +92,8 @@ load_file(MEMLOAD *mp, FILE *fp)
 	int	fd;
 	off_t	skip, flen;
 
-#ifdef _WIN32				/* too difficult to fix this */
+#if defined(_WIN32) || defined(_WIN64)
+				/* too difficult to fix this */
 	return load_stream(mp, fp);
 #endif
 	if (mp == NULL)