diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-18 23:54:12 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-18 23:54:12 +0100 |
| commit | c67dc114eafe034b8223ce3df6474f7c25f150a8 (patch) | |
| tree | 756f6af6a63a57a38b87d44f31cb000d7d6e49d9 /apt-pkg/contrib/macros.h | |
| parent | e426a5ff1cd02797b29f5781be4d6fc8bdf44610 (diff) | |
| parent | 8d4c859d0d20687a8ffcf9e1d60466d061c2e24d (diff) | |
merge MultiArch-ABI. We don't support MultiArch yet (as most other tools),
but we support the usage of the new ABI so libapt users
can start to prepare for MultiArch (Closes: #536029)
Diffstat (limited to 'apt-pkg/contrib/macros.h')
| -rw-r--r-- | apt-pkg/contrib/macros.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 9aeb77b81..c39caf198 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -56,33 +56,33 @@ // some nice optional GNUC features #if __GNUC__ >= 3 - #define __must_check __attribute__ ((warn_unused_result)) - #define __deprecated __attribute__ ((deprecated)) - /* likely() and unlikely() can be used to mark boolean expressions - as (not) likely true which will help the compiler to optimise */ - #define likely(x) __builtin_expect (!!(x), 1) - #define unlikely(x) __builtin_expect (!!(x), 0) + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) #else - #define __must_check /* no warn_unused_result */ - #define __deprecated /* no deprecated */ - #define likely(x) (x) - #define unlikely(x) (x) + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) #endif // cold functions are unlikely() to be called #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 - #define __cold __attribute__ ((__cold__)) + #define __cold __attribute__ ((__cold__)) #else - #define __cold /* no cold marker */ + #define __cold /* no cold marker */ #endif #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute - #define __like_printf_1 __attribute__ ((format (printf, 2, 3))) - #define __like_printf_2 __attribute__ ((format (printf, 3, 4))) + #define __like_printf_1 __attribute__ ((format (printf, 2, 3))) + #define __like_printf_2 __attribute__ ((format (printf, 3, 4))) #else - #define __like_printf_1 - #define __like_printf_2 + #define __like_printf_1 /* no like-printf */ + #define __like_printf_2 /* no like-printf */ #endif #endif |