From 375607b9cc9ddf46a379bab6bf2998c54099d6b5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 7 Jan 2013 15:00:47 +0000 Subject: Clean up __MALLOC_* macros. --- malloc/malloc.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'malloc/malloc.h') diff --git a/malloc/malloc.h b/malloc/malloc.h index 7c8720b31f..9fe7ab26bc 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -28,29 +28,13 @@ #define __malloc_size_t size_t #define __malloc_ptrdiff_t ptrdiff_t -#ifdef __GNUC__ - -# define __MALLOC_P(args) args __THROW -/* This macro will be used for functions which might take C++ callback - functions. */ -# define __MALLOC_PMT(args) args - -# ifdef _LIBC -# define __MALLOC_HOOK_VOLATILE -# define __MALLOC_DEPRECATED -# else -# define __MALLOC_HOOK_VOLATILE volatile -# define __MALLOC_DEPRECATED __attribute_deprecated__ -# endif - -#else /* Not GCC. */ - -# define __MALLOC_P(args) args -# define __MALLOC_PMT(args) args +#ifdef _LIBC # define __MALLOC_HOOK_VOLATILE +# define __MALLOC_DEPRECATED +#else +# define __MALLOC_HOOK_VOLATILE volatile # define __MALLOC_DEPRECATED __attribute_deprecated__ - -#endif /* GCC. */ +#endif __BEGIN_DECLS -- cgit 1.4.1