From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 4 Nov 2005 15:23:32 +0000 (+0000)
Subject: old compiler compatibility (again...)
X-Git-Tag: 1.2.0-rc1~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f8fc4e57e3db620471e5063365b2ff1ddad5219;p=thirdparty%2Fasterisk.git

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 59b699f60b..e9e0037748 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 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 */