--- ray/src/util/rmtxop.c	2015/01/23 01:03:17	2.7
+++ ray/src/util/rmtxop.c	2016/08/18 17:57:57	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmtxop.c,v 2.7 2015/01/23 01:03:17 greg Exp $";
+static const char RCSid[] = "$Id: rmtxop.c,v 2.10 2016/08/18 17:57:57 greg Exp $";
 #endif
 /*
  * General component matrix operations.
@@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: rmtxop.c,v 2.7 2015/
 #include "rtio.h"
 #include "resolu.h"
 #include "rmatrix.h"
+#include "platform.h"
 
 #define MAXCOMP		50		/* #components we support */
 
@@ -231,15 +232,10 @@ main(int argc, char *argv[])
 	if (mres == NULL)		/* check that we got something */
 		goto userr;
 					/* write result to stdout */
-#ifdef getc_unlocked
-	flockfile(stdout);
-#endif
 	if (outfmt == DTfromHeader)
 		outfmt = mres->dtype;
-#ifdef _WIN32
 	if (outfmt != DTascii)
-		_setmode(fileno(stdout), _O_BINARY);
-#endif
+		SET_FILE_BINARY(stdout);
 	newheader("RADIANCE", stdout);
 	printargs(argc, argv, stdout);
 	if (!rmx_write(mres, outfmt, stdout)) {