From b7f3a3928c3fe1e4535c5a3d8c75aed5a74193ce Mon Sep 17 00:00:00 2001
From: amorris <amorris@a8e31b63-e6ca-409b-a01b-2eec1b506579>
Date: Wed, 1 Sep 2004 22:49:37 +0000
Subject: [PATCH] Fix for win32.

git-svn-id: file:///mnt/fast/tau2git/svnroot/trunk/tau2@2662 a8e31b63-e6ca-409b-a01b-2eec1b506579
---
 utils/tau_merge.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/tau_merge.c b/utils/tau_merge.c
index a04be7dee..1328b5c9e 100644
--- a/utils/tau_merge.c
+++ b/utils/tau_merge.c
@@ -31,6 +31,7 @@ int getdtablesize(void);
     #include <io.h>
     #include "getopt.h"
   #else
+    #define O_BINARY 0
     #include <unistd.h>
   #endif
 #endif
@@ -394,7 +395,7 @@ int main(int argc, char *argv[])
   for (i=optind; i<argc-1; i++)
   {
     /* -- open input trace -------------------------------------------------- */
-    if ( (trcdes[numtrc].fd = open (argv[i], O_RDONLY)) < 0 )
+    if ( (trcdes[numtrc].fd = open (argv[i], O_RDONLY | O_BINARY)) < 0 )
     {
       perror (argv[i]);
       errflag = TRUE;
@@ -506,7 +507,7 @@ int main(int argc, char *argv[])
       fprintf (stderr, "%s exists; override [y]? ", trcfile);
       if ( getchar() == 'n' ) exit (1);
     }
-    if ( (outfd = open (trcfile, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 )
+    if ( (outfd = open (trcfile, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) < 0 )
     {
       perror (trcfile);
       exit (1);
@@ -591,7 +592,7 @@ int main(int argc, char *argv[])
     /* -- if file was closed during the search for barriers, re-open it ----- */
     if ( trcdes[i].fd = -1 )
     {
-      if ( (trcdes[i].fd = open (trcdes[i].name, O_RDONLY)) < 0 )
+      if ( (trcdes[i].fd = open (trcdes[i].name, O_RDONLY|O_BINARY)) < 0 )
       {
         perror (argv[i]);
         exit (1);