Restore previous ogl sources. Waiting for fix in configure system

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 4a407852701385f54b1d6e233632f72c9e5e4232..93598c8bb0b2fe81fa7c760f0df8abf91794f5fd 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -220,10 +220,11 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 #ifdef __WXMAC__
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 #ifdef __WXMAC__

-  int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+    int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);

 #else
     int fd = open(wxFNCONV(szFileName),
 #else
     int fd = open(wxFNCONV(szFileName),

-                  O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
+                  O_BINARY | O_WRONLY | O_CREAT |
+                  (bOverwrite ? O_TRUNC : O_EXCL)

                   ACCESS(accessMode));
 #endif
     if ( fd == -1 ) {
                   ACCESS(accessMode));
 #endif
     if ( fd == -1 ) {


@@ -260,7 +261,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
     }
 
 #ifdef __WXMAC__
     }
 
 #ifdef __WXMAC__

-  int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
+    int fd = open(wxUnix2MacFilename( szFileName ), flags, access);

 #else
     int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
 #endif
 #else
     int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
 #endif


@@ -458,8 +459,7 @@ bool wxFile::Eof() const
             return FALSE;
 
         case -1:
             return FALSE;
 
         case -1:

-            wxLogSysError(_("can't determine if the end of file is reached on \
-                descriptor %d"), m_fd);
+            wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);

                 break;
 
         default:
                 break;
 
         default: