diff --git a/src/st/st-icon-cache.c b/src/st/st-icon-cache.c index 4891d4116..d29cfd621 100644 --- a/src/st/st-icon-cache.c +++ b/src/st/st-icon-cache.c @@ -28,9 +28,6 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef G_OS_WIN32 -#include -#endif #include #include #include @@ -104,20 +101,6 @@ _gtk_icon_cache_new_for_path (const char *path) if (fd < 0) goto done; -#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) || defined (__MINGW64_VERSION_MAJOR)) && !defined(_WIN64) -#undef fstat /* Just in case */ -#define fstat _fstat32 -#elif defined(__MINGW64_VERSION_MAJOR) && defined(_WIN64) -#undef fstat -#define fstat _fstat64 -#endif -#endif - if (fstat (fd, &st) < 0 || st.st_size < 4) goto done; diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c index fae41bc7c..6c569663c 100644 --- a/src/st/st-icon-theme.c +++ b/src/st/st-icon-theme.c @@ -19,25 +19,13 @@ #include #include -#ifdef HAVE_UNISTD_H #include -#endif #include #include #include #include #include -#ifdef G_OS_WIN32 -#ifndef S_ISDIR -#define S_ISDIR(mode) ((mode)&_S_IFDIR) -#endif -#define WIN32_LEAN_AND_MEAN -#include -#include -#include "win32/gdkwin32.h" -#endif /* G_OS_WIN32 */ - #include "st-icon-theme.h" #include "gtkcsspalettevalueprivate.h" #include "gtkcssrgbavalueprivate.h" @@ -55,11 +43,6 @@ #include "deprecated/gtkstyle.h" -/* this is in case round() is not provided by the compiler, - * such as in the case of C89 compilers, like MSVC - */ -#include "fallback-c89.c" - #define DEFAULT_ICON_THEME "Adwaita" /** @@ -1768,30 +1751,6 @@ real_choose_icon (GtkIconTheme *icon_theme, if (unthemed_icon) break; } -#ifdef G_OS_WIN32 - /* Still not found an icon, check if reference to a Win32 resource */ - if (!unthemed_icon) - { - char **resources; - HICON hIcon = NULL; - - resources = g_strsplit (icon_names[0], ",", 0); - if (resources[0]) - { - wchar_t *wfile = g_utf8_to_utf16 (resources[0], -1, NULL, NULL, NULL); - ExtractIconExW (wfile, resources[1] ? atoi (resources[1]) : 0, &hIcon, NULL, 1); - g_free (wfile); - } - - if (hIcon) - { - icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1); - icon_info->cache_pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon, NULL, NULL); - DestroyIcon (hIcon); - } - g_strfreev (resources); - } -#endif if (unthemed_icon) {