--- ray/src/common/portio.c	1992/07/13 15:36:01	2.1
+++ ray/src/common/portio.c	2004/09/14 02:53:50	2.11
@@ -1,16 +1,29 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: portio.c,v 2.11 2004/09/14 02:53:50 greg Exp $";
 #endif
-
 /*
  * Portable i/o for binary files
+ *
+ * External symbols declared in standard.h
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
 
+#include "rtio.h"
 
+#include <math.h>
+
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef putc
+#define getc    getc_unlocked
+#define putc    putc_unlocked
+#endif
+
+
+void
 putstr(s, fp)			/* write null-terminated string to fp */
 register char  *s;
 register FILE  *fp;
@@ -21,20 +34,22 @@ register FILE  *fp;
 }
 
 
+void
 putint(i, siz, fp)		/* write a siz-byte integer to fp */
 long  i;
 register int  siz;
 register FILE  *fp;
 {
 	while (siz--)
-		putc(i>>(siz<<3) & 0xff, fp);
+		putc((int)(i>>(siz<<3) & 0xff), fp);
 }
 
 
+void
 putflt(f, fp)			/* put out floating point number */
-double  f;
+double	f;
+FILE  *fp;
 {
-	extern double  frexp();
 	int  e;
 
 	putint((long)(frexp(f,&e)*0x7fffffff), 4, fp);
@@ -84,9 +99,10 @@ double
 getflt(fp)			/* get a floating point number */
 FILE  *fp;
 {
-	extern double  ldexp();
-	double  d;
+	long	l;
+	double	d;
 
-	d = (double)getint(4, fp)/0x7fffffff;
+	l = getint(4, fp);
+	d = (l + (l > 0 ? .5 : -.5)) * (1./0x7fffffff);
 	return(ldexp(d, (int)getint(1, fp)));
 }