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

* mingwex/mingw-fseek.c (INLINE): Remove define.

Browse Source 
(__mingw_is_win9x): Remove static inline function.
	(_mingw_fwrite): Use _osver instead of __mingw_is_win9x.
This commit is contained in:
Danny Smith 2003-01-26 06:38:43 +00:00
parent 5da947eaca
commit 989c97fe14
2 changed files with 8 additions and 33 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 @@
2003-01-26 Danny Smith <dannysmith@users.sourceforge.net>
* mingwex/mingw-fseek.c (INLINE): Remove define.
(__mingw_is_win9x): Remove static inline function.
(_mingw_fwrite): Use _osver instead of __mingw_is_win9x.
2003-01-11 Danny Smith <dannysmith@users.sourceforge.net> 2003-01-11 Danny Smith <dannysmith@users.sourceforge.net>
* mingwex/math/llround.c: Correct function name and * mingwex/math/llround.c: Correct function name and

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

@ -8,42 +8,11 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <io.h> #include <io.h>
#include <stdlib.h>
#ifdef __GNUC__
# define INLINE __inline__
#elif defined _MSC_VER
# define INLINE __inline
#else
# define INLINE
#endif
#define ZEROBLOCKSIZE 512 #define ZEROBLOCKSIZE 512
static int __mingw_fseek_called; static int __mingw_fseek_called;
/* FIXME: put this in startup code and make os_platform_id global?
Or just get _osver from msvcrt.dll and bitest (_osver & 0x8000)? */
INLINE
static
int
__mingw_is_win9x (void)
{
static DWORD os_platform_id = -1 ;
if (os_platform_id == -1)
{
OSVERSIONINFO os_version_info;
memset (&os_version_info, 0, sizeof (OSVERSIONINFO));
os_version_info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
GetVersionEx (&os_version_info);
os_platform_id = os_version_info.dwPlatformId;
}
/* Don't even bother to check for Win32s. */
return os_platform_id == VER_PLATFORM_WIN32_WINDOWS;
}
/* The fseek in Win9x runtime does not zero out the file if seeking past /* The fseek in Win9x runtime does not zero out the file if seeking past
the end; if you don't want random stuff from your disk included in your the end; if you don't want random stuff from your disk included in your
output DLL/executable, use this version instead. On WinNT/Win2k, it output DLL/executable, use this version instead. On WinNT/Win2k, it
@ -64,7 +33,7 @@ int
__mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp) __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
{ {
# undef fwrite # undef fwrite
if ( __mingw_is_win9x () && __mingw_fseek_called) if ((_osver & 0x8000) && __mingw_fseek_called)
{ {
DWORD actual_length, current_position; DWORD actual_length, current_position;
__mingw_fseek_called = 0; __mingw_fseek_called = 0;