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:
parent
69080f58f0
commit
1e9f105575
|
@ -1,11 +1,17 @@
|
||||||
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
|
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
|
||||||
|
|
||||||
* mingwex/isblank.c: Fix typo in declaration.
|
* 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>
|
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
|
||||||
|
|
||||||
* include/_mingw.h: Define GCC system_header only if PCC is not defined.
|
* mingwex/isblank.c: Fix typo in declaration.
|
||||||
* include/stdlib.h: Fix a long-standing typo which prevented correct use of
|
|
||||||
|
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
|
||||||
|
|
||||||
|
* include/_mingw.h: Define GCC system_header only if PCC is not defined.
|
||||||
|
* include/stdlib.h: Fix a long-standing typo which prevented correct use of
|
||||||
the MB_CUR_MAX macro/variable when DECLSPEC is not supported and <stdlib.h>
|
the MB_CUR_MAX macro/variable when DECLSPEC is not supported and <stdlib.h>
|
||||||
is included before <ctype.h>.
|
is included before <ctype.h>.
|
||||||
|
|
||||||
|
|
|
@ -47,16 +47,16 @@ __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
|
||||||
LARGE_INTEGER current_position = {{0LL}};
|
LARGE_INTEGER current_position = {{0LL}};
|
||||||
__mingw_fseek_called = 0;
|
__mingw_fseek_called = 0;
|
||||||
fflush (fp);
|
fflush (fp);
|
||||||
actual_length.LowPart = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)),
|
actual_length.u.LowPart = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)),
|
||||||
&actual_length.HighPart);
|
&actual_length.u.HighPart);
|
||||||
if (actual_length.LowPart == 0xFFFFFFFF
|
if (actual_length.u.LowPart == 0xFFFFFFFF
|
||||||
&& GetLastError() != NO_ERROR )
|
&& GetLastError() != NO_ERROR )
|
||||||
return -1;
|
return -1;
|
||||||
current_position.LowPart = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
|
current_position.u.LowPart = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
|
||||||
current_position.LowPart,
|
current_position.u.LowPart,
|
||||||
¤t_position.HighPart,
|
¤t_position.u.HighPart,
|
||||||
FILE_CURRENT);
|
FILE_CURRENT);
|
||||||
if (current_position.LowPart == 0xFFFFFFFF
|
if (current_position.u.LowPart == 0xFFFFFFFF
|
||||||
&& GetLastError() != NO_ERROR )
|
&& GetLastError() != NO_ERROR )
|
||||||
return -1;
|
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)));
|
FlushFileBuffers ((HANDLE) _get_osfhandle (fileno (fp)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return fwrite (buffer, size, count, fp);
|
return (fwrite) (buffer, size, count, fp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue