diff options
Diffstat (limited to 'libmsi/msipriv.h')
-rw-r--r-- | libmsi/msipriv.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index 59ee2f2..d94ff5e 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -426,31 +426,25 @@ static const WCHAR szData[] = {'D','a','t','a',0}; /* memory allocation macro functions */ -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) -#else -#define __WINE_ALLOC_SIZE(x) -#endif - -static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); +static void *msi_alloc( size_t len ) G_GNUC_ALLOC_SIZE(1); static inline void *msi_alloc( size_t len ) { return malloc(len); } -static void *msi_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); +static void *msi_alloc_zero( size_t len ) G_GNUC_ALLOC_SIZE(1); static inline void *msi_alloc_zero( size_t len ) { return calloc(len, 1); } -static void *msi_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); +static void *msi_realloc( void *mem, size_t len ) G_GNUC_ALLOC_SIZE(2); static inline void *msi_realloc( void *mem, size_t len ) { return realloc(mem, len); } -static void *msi_realloc_zero( void *mem, size_t oldlen, size_t len ) __WINE_ALLOC_SIZE(3); +static void *msi_realloc_zero( void *mem, size_t oldlen, size_t len ) G_GNUC_ALLOC_SIZE(3); static inline void *msi_realloc_zero( void *mem, size_t oldlen, size_t len ) { mem = realloc( mem, len ); |