diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 77229ce4cba..912373d91dd 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -197,29 +197,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex ) LeaveCriticalSection(&SHELL32_SicCS); return ret; } -/**************************************************************************** - * SIC_GetIcon [internal] - * - * NOTES - * retrieves the specified icon from the iconcache. if not found tries to load the icon - */ -static HICON WINE_UNUSED SIC_GetIcon (LPCWSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon ) -{ INT index; - - TRACE("%s %i\n", debugstr_w(sSourceFile), dwSourceIndex); - - index = SIC_GetIconIndex(sSourceFile, dwSourceIndex); - - if (INVALID_INDEX == index) - { - return (HICON)INVALID_INDEX; - } - - if (bSmallIcon) - return ImageList_GetIcon(ShellSmallIconList, index, ILD_NORMAL); - return ImageList_GetIcon(ShellBigIconList, index, ILD_NORMAL); - -} /***************************************************************************** * SIC_Initialize [internal] * diff --git a/include/wine/exception.h b/include/wine/exception.h index 0b82c3a0d9c..cc03fdb69c6 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -74,6 +74,10 @@ #else /* USE_COMPILER_EXCEPTIONS */ +#ifndef __GNUC__ +#define __attribute__(x) /* nothing */ +#endif + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ @@ -90,7 +94,7 @@ __f.u.filter = (func); \ __wine_push_frame( &__f.frame ); \ if (sigsetjmp( __f.jmp, 1 )) { \ - const __WINE_FRAME * const __eptr WINE_UNUSED = &__f; \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { #define __ENDTRY \ diff --git a/include/winnt.h b/include/winnt.h index 901a6773888..8dd06a2b760 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -31,14 +31,6 @@ #define NTAPI __stdcall -/* Macro for structure packing and more. */ - -#ifdef __GNUC__ -#define WINE_UNUSED __attribute__((unused)) -#else -#define WINE_UNUSED /* nothing */ -#endif - #if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(MIDL_PASS) # if defined(_MSC_VER) # define DECLSPEC_IMPORT __declspec(dllimport) diff --git a/windows/driver.c b/windows/driver.c index eca8a24f56a..696d83e7ac9 100644 --- a/windows/driver.c +++ b/windows/driver.c @@ -57,7 +57,8 @@ static LPWINE_DRIVER lpDrvItemList = NULL; /************************************************************************** * LoadStartupDrivers [internal] */ -static void WINE_UNUSED DRIVER_LoadStartupDrivers(void) +#if 0 +static void DRIVER_LoadStartupDrivers(void) { char str[256]; @@ -75,6 +76,7 @@ static void WINE_UNUSED DRIVER_LoadStartupDrivers(void) TRACE("end of list !\n"); } } +#endif /************************************************************************** * DRIVER_GetNumberOfModuleRefs [internal]