diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2005-04-21 06:30:23 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-04-21 06:30:23 +0000 |
| commit | a729a57ba121061fd42f5dd4f557ed1f18d6dc99 (patch) | |
| tree | 32ef323c5510fa3321c859182f59030f2c675829 /codecs/gsm/inc | |
| parent | 1f9ab2380a4543526bbd20e0fa754de95747c77e (diff) | |
fix various compiler warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/gsm/inc')
| -rwxr-xr-x | codecs/gsm/inc/private.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/codecs/gsm/inc/private.h b/codecs/gsm/inc/private.h index 140aef1ae..b7115ae51 100755 --- a/codecs/gsm/inc/private.h +++ b/codecs/gsm/inc/private.h @@ -151,13 +151,18 @@ static __inline__ short GSM_SUB(short a, short b) */ /* Nonportable, but faster: */ -#define GSM_ADD(a, b) \ - ((ulongword)((ltmp = (longword)(a) + (longword)(b)) - MIN_WORD) > \ - MAX_WORD - MIN_WORD ? (ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp) - -# define GSM_SUB(a, b) \ - ((ltmp = (longword)(a) - (longword)(b)) >= MAX_WORD \ - ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp) +# define GSM_ADD(a, b) ({ \ + register longword ltmp; \ + ltmp = (longword) (a) + (longword) (b); \ + ((ulongword) (ltmp - MIN_WORD) > MAX_WORD - MIN_WORD ? \ + (ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp); \ + }) + +#define GSM_SUB(a, b) ({ \ + register longword ltmp; \ + ltmp = (longword) (a) - (longword) (b); \ + (ltmp >= MAX_WORD ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp); \ + }) #endif |