diff options
author | George Joseph <george.joseph@fairview5.com> | 2015-04-06 19:04:32 +0000 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2015-04-06 19:04:32 +0000 |
commit | e48f2e7897079936ef2cb91fd15b88c319a3cdc9 (patch) | |
tree | 1f3ca7e6d30c958207fbeba1275a3b6bb29fde8a /include/asterisk | |
parent | 0543879228048f6580a75b098fb9f3a5ccec1ed8 (diff) |
build: Fixes for gcc 5 compilation
These are fixes for compilation under gcc 5.0...
chan_sip.c: In parse_request needed to make 'lim' unsigned.
inline_api.h: Needed to add a check for '__GNUC_STDC_INLINE__' to detect C99
inline semantics (same as clang).
ccss.c: In ast_cc_set_parm, needed to fix weird comparison.
dsp.c: Needed to work around a possible compiler bug. It was throwing
an array-bounds error but neither
sgriepentrog, rmudgett nor I could figure out why.
manager.c: In action_atxfer, needed to correct an array allocation.
This patch will go to 11, 13, trunk.
Review: https://reviewboard.asterisk.org/r/4581/
Reported-by: Jeffrey Ollie
Tested-by: George Joseph
ASTERISK-24932 #close
........
Merged revisions 434113 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 434114 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/inline_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/inline_api.h b/include/asterisk/inline_api.h index d76dfa0a5..291a83828 100644 --- a/include/asterisk/inline_api.h +++ b/include/asterisk/inline_api.h @@ -48,7 +48,7 @@ #if !defined(LOW_MEMORY) && !defined(DISABLE_INLINE) #if !defined(AST_API_MODULE) -#if defined(__clang__) +#if defined(__clang__) || defined(__GNUC_STDC_INLINE__) #define AST_INLINE_API(hdr, body) static hdr; static inline hdr body #else /* if defined(__clang__) */ #define AST_INLINE_API(hdr, body) hdr; extern inline hdr body |