--- ray/src/px/ra_rgbe.c	2003/04/23 00:52:34	2.11
+++ ray/src/px/ra_rgbe.c	2004/01/02 12:47:01	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ra_rgbe.c,v 2.11 2003/04/23 00:52:34 greg Exp $";
+static const char	RCSid[] = "$Id: ra_rgbe.c,v 2.16 2004/01/02 12:47:01 schorsch Exp $";
 #endif
 /*
  *  program to convert from RADIANCE RLE to flat format
@@ -8,15 +8,13 @@ static const char	RCSid[] = "$Id: ra_rgbe.c,v 2.11 200
 #include  <stdio.h>
 #include  <math.h>
 #include  <time.h>
+#include  <string.h>
+
+#include  "platform.h"
+#include  "rtprocess.h"
 #include  "color.h"
 #include  "resolu.h"
 
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
-
-extern int	addhline();
-
 #define dumpheader(fp)	fwrite(headlines, 1, headlen, fp)
 
 int  bradj = 0;				/* brightness adjustment */
@@ -34,7 +32,9 @@ int  headlen;				/* current header length */
 
 char  *progname;
 
+static gethfunc addhline;
 
+
 main(argc, argv)
 int  argc;
 char  *argv[];
@@ -77,9 +77,7 @@ gotfile:
 				progname, argv[i]);
 		exit(1);
 	}
-#ifdef MSDOS
-	setmode(fileno(stdin), O_BINARY);
-#endif
+	SET_FILE_BINARY(stdin);
 	ospec = i==argc-2 ? argv[i+1] : (char *)NULL;
 	while (transfer(ospec))
 		;
@@ -95,7 +93,7 @@ userr:
 transfer(ospec)			/* transfer a Radiance picture */
 char	*ospec;
 {
-	char	oname[128];
+	char	oname[PATH_MAX];
 	FILE	*fp;
 	int	order;
 	int	xmax, ymax;
@@ -154,9 +152,7 @@ char	*ospec;
 			}
 		}
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 	dumpheader(fp);			/* put out header */
 	fputs(progname, fp);
 	if (bradj)
@@ -196,9 +192,11 @@ char	*ospec;
 }
 
 
-int
-addhline(s)			/* add a line to our info. header */
-char	*s;
+static int
+addhline(			/* add a line to our info. header */
+	char	*s,
+	void	*p
+)
 {
 	char	fmt[32];
 	int	n;