Commit 4588df97 authored by Chun-wei Fan's avatar Chun-wei Fan

Bug 660730: Win32: Only use _fstat32 if available

_fstat32 is only introduced with msvcrt80.dll (i.e. Visual C++ 2005),
in which using this function will break compilation with MinGW,
which links against msvcrt.dll.  The msvcrt.lib in the Windows DDK
which links to a later incarnation of the msvcrt.dll in later Windows
systems may have this symbol defined, but that needs to be checked
upon to be sure.

Thanks to Dieter Verfaillie for pointing out this problem.
parent 7df27e2c
...@@ -109,8 +109,14 @@ _gtk_icon_cache_new_for_path (const gchar *path) ...@@ -109,8 +109,14 @@ _gtk_icon_cache_new_for_path (const gchar *path)
goto done; goto done;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
/* Bug 660730: _fstat32 is only defined in msvcrt80.dll+/VS 2005+ */
/* or possibly in the msvcrt.dll linked to by the Windows DDK */
/* (will need to check on the Windows DDK part later) */
#if (_MSC_VER >= 1400 || __MSVCRT_VERSION__ >= 0x0800)
#undef fstat /* Just in case */ #undef fstat /* Just in case */
#define fstat _fstat32 #define fstat _fstat32
#endif #endif
if (fstat (fd, &st) < 0 || st.st_size < 4) if (fstat (fd, &st) < 0 || st.st_size < 4)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment