Make setmode optional on unix platforms.

Common/Include/fileutil.h

@@ -40,11 +40,13 @@ using namespace std;
 FILE * fopenOrDie (const string & pathname, const char * mode);
 FILE * fopenOrDie (const wstring & pathname, const wchar_t * mode);
 
+#ifndef __unix__
 // ----------------------------------------------------------------------------
 // fsetmode(): set mode to binary or text
 // ----------------------------------------------------------------------------
 
 void fsetmode (FILE * f, char type);
+#endif
 
 // ----------------------------------------------------------------------------
 // freadOrDie(): like fread() but terminate with err msg in case of error

Common/fileutil.cpp

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //
 // <copyright file="FileUtil.cpp" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
@@ -1602,4 +1603,4 @@ vector<string> sep_string(const string & istr, const string & sep)
     vstr.push_back(trim(csub));
 
     return vstr;
-}
+}

DataReader/HTKMLFReader/fileutil.cpp

@@ -24,8 +24,10 @@
 
 #ifndef UNDER_CE  // some headers don't exist under winCE - the appropriate definitions seem to be in stdlib.h
 #include <fcntl.h>      // for _O_BINARY/TEXT - not needed for wince
+#ifndef __unix__
 #include <io.h>         // for _setmode()
 #endif
+#endif
 
 #include <errno.h>
 
@@ -44,13 +46,15 @@ static const wchar_t * strchr (const wchar_t * s, wchar_t v) { return wcschr (s,
 template<class _T> FILE * fopenStdHandle (const _T * mode)
 {
     FILE * f = strchr (mode, 'r') ? stdin : stdout;
-    if (strchr (mode, 'b') || strchr (mode, 't'))   // change binary mode
+#ifndef __unix__ // don't need binary/text distinction on unix
+	if (strchr(mode, 'b') || strchr(mode, 't'))   // change binary mode
     {
         // switch to binary mode if not yet (in case it is stdin)
         int rc = _setmode (_fileno (f), strchr (mode, 'b') ? _O_BINARY : _O_TEXT);
         if (rc == -1)
             RuntimeError ("error switching stream to binary mode: %s", strerror (errno));
     }
+#endif
     return f;
 }
 
@@ -88,7 +92,8 @@ FILE * fopenOrDie (const WSTRING & pathname, const wchar_t * mode)
 // set mode to binary or text (pass 'b' or 't')
 // ----------------------------------------------------------------------------
 
-void fsetmode (FILE * f, char type)
+#ifndef __unix__ // don't need binary/text distinction on unix
+void fsetmode(FILE * f, char type)
 {
     if (type != 'b' && type != 't')
     {
@@ -106,6 +111,7 @@ void fsetmode (FILE * f, char type)
     RuntimeError ("error changing file mode: %s", strerror (errno));
     }
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // freadOrDie(): like fread() but terminate with err msg in case of error

DataReader/HTKMLFReader/fileutil.h

@@ -29,11 +29,13 @@ using namespace std;
 FILE * fopenOrDie (const STRING & pathname, const char * mode);
 FILE * fopenOrDie (const WSTRING & pathname, const wchar_t * mode);
 
+#ifndef __unix__ // don't need binary/text distinction on unix
 // ----------------------------------------------------------------------------
 // fsetmode(): set mode to binary or text
 // ----------------------------------------------------------------------------
 
 void fsetmode (FILE * f, char type);
+#endif
 
 // ----------------------------------------------------------------------------
 // freadOrDie(): like fread() but terminate with err msg in case of error