mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
dlls: Do not use __WINE_ALLOC_SIZE between void and *.
This commit is contained in:
parent
6d0ffa50a0
commit
9593c9e6f5
4 changed files with 15 additions and 10 deletions
|
@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR);
|
|||
|
||||
/* memory allocation functions */
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)
|
||||
{
|
||||
return HeapAlloc(GetProcessHeap(), 0, len);
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len)
|
||||
{
|
||||
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len)
|
||||
{
|
||||
return HeapReAlloc(GetProcessHeap(), 0, mem, len);
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(2) *heap_realloc_zero(void *mem, size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len)
|
||||
{
|
||||
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len);
|
||||
}
|
||||
|
|
|
@ -51,11 +51,16 @@ extern HINSTANCE LOCALSPL_hInstance;
|
|||
|
||||
/* ## Memory allocation functions ## */
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len )
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
|
||||
{
|
||||
return HeapAlloc( GetProcessHeap(), 0, len );
|
||||
}
|
||||
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len )
|
||||
{
|
||||
return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
|
||||
}
|
||||
|
||||
static inline BOOL heap_free( void *mem )
|
||||
{
|
||||
return HeapFree( GetProcessHeap(), 0, mem );
|
||||
|
|
|
@ -654,17 +654,17 @@ extern LONG module_ref;
|
|||
|
||||
/* memory allocation functions */
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)
|
||||
{
|
||||
return HeapAlloc(GetProcessHeap(), 0, len);
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len)
|
||||
{
|
||||
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len)
|
||||
static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len)
|
||||
{
|
||||
return HeapReAlloc(GetProcessHeap(), 0, mem, len);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ struct _RTF_Info;
|
|||
|
||||
extern HANDLE me_heap;
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len )
|
||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
|
||||
{
|
||||
return HeapAlloc( me_heap, 0, len );
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ static inline BOOL heap_free( void *ptr )
|
|||
return HeapFree( me_heap, 0, ptr );
|
||||
}
|
||||
|
||||
static inline void __WINE_ALLOC_SIZE(2) *heap_realloc( void *ptr, size_t len )
|
||||
static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len )
|
||||
{
|
||||
return HeapReAlloc( me_heap, 0, ptr, len );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue