diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-01-07 15:00:47 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-01-07 15:00:47 +0000 |
| commit | 375607b9cc9ddf46a379bab6bf2998c54099d6b5 (patch) | |
| tree | a5870230b29af0ea96032ea7abc9f3a131ca3dc0 /malloc/malloc.h | |
| parent | a9708fed779ff4e61e07ec2eae78e5c0753e1222 (diff) | |
| download | glibc-375607b9cc9ddf46a379bab6bf2998c54099d6b5.tar.gz glibc-375607b9cc9ddf46a379bab6bf2998c54099d6b5.tar.xz glibc-375607b9cc9ddf46a379bab6bf2998c54099d6b5.zip | |
Clean up __MALLOC_* macros.
Diffstat (limited to 'malloc/malloc.h')
| -rw-r--r-- | malloc/malloc.h | 26 |
1 files changed, 5 insertions, 21 deletions
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 |