Get rid of the WINE_UNUSED macro.

This commit is contained in:
Alexandre Julliard 2004-09-01 17:36:04 +00:00
parent bf5470c00e
commit b0394dea42
4 changed files with 8 additions and 33 deletions

View File

@ -197,29 +197,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex )
LeaveCriticalSection(&SHELL32_SicCS); LeaveCriticalSection(&SHELL32_SicCS);
return ret; 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] * SIC_Initialize [internal]
* *

View File

@ -74,6 +74,10 @@
#else /* USE_COMPILER_EXCEPTIONS */ #else /* USE_COMPILER_EXCEPTIONS */
#ifndef __GNUC__
#define __attribute__(x) /* nothing */
#endif
#define __TRY \ #define __TRY \
do { __WINE_FRAME __f; \ do { __WINE_FRAME __f; \
int __first = 1; \ int __first = 1; \
@ -90,7 +94,7 @@
__f.u.filter = (func); \ __f.u.filter = (func); \
__wine_push_frame( &__f.frame ); \ __wine_push_frame( &__f.frame ); \
if (sigsetjmp( __f.jmp, 1 )) { \ if (sigsetjmp( __f.jmp, 1 )) { \
const __WINE_FRAME * const __eptr WINE_UNUSED = &__f; \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \
do { do {
#define __ENDTRY \ #define __ENDTRY \

View File

@ -31,14 +31,6 @@
#define NTAPI __stdcall #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(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(MIDL_PASS)
# if defined(_MSC_VER) # if defined(_MSC_VER)
# define DECLSPEC_IMPORT __declspec(dllimport) # define DECLSPEC_IMPORT __declspec(dllimport)

View File

@ -57,7 +57,8 @@ static LPWINE_DRIVER lpDrvItemList = NULL;
/************************************************************************** /**************************************************************************
* LoadStartupDrivers [internal] * LoadStartupDrivers [internal]
*/ */
static void WINE_UNUSED DRIVER_LoadStartupDrivers(void) #if 0
static void DRIVER_LoadStartupDrivers(void)
{ {
char str[256]; char str[256];
@ -75,6 +76,7 @@ static void WINE_UNUSED DRIVER_LoadStartupDrivers(void)
TRACE("end of list !\n"); TRACE("end of list !\n");
} }
} }
#endif
/************************************************************************** /**************************************************************************
* DRIVER_GetNumberOfModuleRefs [internal] * DRIVER_GetNumberOfModuleRefs [internal]