aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-04 15:23:32 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-04 15:23:32 +0000
commit909e56f0ebbc4f38ab124990739a16de3b76f890 (patch)
treedd3660c8bf8f70a9b1481eab28d0e58f4762fe92
parent2786f77f14f3c19b077a73cd341f9c93bf2eac6d (diff)
old compiler compatibility (again...)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6960 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog4
-rwxr-xr-xinclude/asterisk/compiler.h7
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 59b699f60..e9e003774 100755
--- 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 62564c91c..24f6907d1 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 */