old compiler compatibility (again...)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6960 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ChangeLog b/ChangeLog
index 59b699f60b4bace61a6547914397fb5975ed2aeb..e9e0037748d6a90dbf30fba16d78d6651c1fd88a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h
index 62564c91cf5685ca34d2e0df3c62c014b80a1d94..24f6907d1f1549001504563de6308b232dcac901 100755 (executable)
--- 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 */