old compiler compatibility (again...)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago · 8f8fc4e57e
parent 929d7e6e9b
commit 8f8fc4e57e
2 changed files with 6 additions and 5 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2005-11-04  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* include/asterisk/compiler.h: don't try to use always_inline on old compilers
+
 2005-11-03  Russell Bryant  <russell@digium.com>

 	* res/res_agi.c: initialize buffer for result so that the contents are always valid in the response to GET FULL VARIABLE
--- 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 */