JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2011-05-22 Antoine LECA <antoinel@users.sourceforge.net> 

* mingwex/mingw-fseek.c: The anonymous union feature for LARGE_INTEGER is
        not always available, go the long way and use the explicit named union
        members, which are also declared in winnt.h.
This commit is contained in:
Chris Sutcliffe 2011-05-23 02:54:21 +00:00
parent 69080f58f0
commit 1e9f105575
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/mingw/ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
* mingwex/mingw-fseek.c: The anonymous union feature for LARGE_INTEGER is
not always available, go the long way and use the explicit named union
members, which are also declared in winnt.h.
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
* mingwex/isblank.c: Fix typo in declaration.

16
winsup/mingw/mingwex/mingw-fseek.c
View File

@ -47,16 +47,16 @@ __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
LARGE_INTEGER current_position = {{0LL}};
__mingw_fseek_called = 0;
fflush (fp);
actual_length.LowPart = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)),
&actual_length.HighPart);
if (actual_length.LowPart == 0xFFFFFFFF
actual_length.u.LowPart = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)),
&actual_length.u.HighPart);
if (actual_length.u.LowPart == 0xFFFFFFFF
&& GetLastError() != NO_ERROR )
return -1;
current_position.LowPart = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
current_position.LowPart,
&current_position.HighPart,
current_position.u.LowPart = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
current_position.u.LowPart,
&current_position.u.HighPart,
FILE_CURRENT);
if (current_position.LowPart == 0xFFFFFFFF
if (current_position.u.LowPart == 0xFFFFFFFF
&& GetLastError() != NO_ERROR )
return -1;
@ -102,5 +102,5 @@ __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
FlushFileBuffers ((HANDLE) _get_osfhandle (fileno (fp)));
}
}
return fwrite (buffer, size, count, fp);
return (fwrite) (buffer, size, count, fp);
}