From 8f8fc4e57e3db620471e5063365b2ff1ddad5219 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 4 Nov 2005 15:23:32 +0000 Subject: [PATCH] old compiler compatibility (again...) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6960 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- ChangeLog | 4 ++++ include/asterisk/compiler.h | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59b699f60b..e9e0037748 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-04 Kevin P. Fleming + + * include/asterisk/compiler.h: don't try to use always_inline on old compilers + 2005-11-03 Russell Bryant * res/res_agi.c: initialize buffer for result so that the contents are always valid in the response to GET FULL VARIABLE diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h index 62564c91cf..24f6907d1f 100755 --- a/include/asterisk/compiler.h +++ b/include/asterisk/compiler.h @@ -25,12 +25,9 @@ #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) #define __builtin_expect(exp, c) (exp) -#endif - -#ifdef __GNUC__ -#define force_inline inline __attribute__((always_inline)) -#else #define force_inline inline +#else +#define force_inline inline __attribute__((always_inline)) #endif #endif /* _ASTERISK_COMPILER_H */