diff options
author | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-03-07 06:00:13 +0000 |
---|---|---|
committer | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-03-07 06:00:13 +0000 |
commit | f2c4538f612a8976c7cc8893000165fa06733ddb (patch) | |
tree | 9cf97910c36b158e27853b640770c246ff9e8066 /formats | |
parent | a8723ad68f80bafb65ee6a66d2b4b1f6a7ee01c8 (diff) |
Fri Mar 7 07:00:00 CET 2003
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats')
-rwxr-xr-x | formats/msgsm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/formats/msgsm.h b/formats/msgsm.h index 2513e72b1..de0464a8b 100755 --- a/formats/msgsm.h +++ b/formats/msgsm.h @@ -2,7 +2,9 @@ #define GSM_MAGIC 0xD +#ifndef GSM_H typedef unsigned char gsm_byte; +#endif typedef unsigned char wav_byte; typedef unsigned int uword; @@ -109,7 +111,7 @@ typedef unsigned int uword; xmc[51] = *c & 0x7; /* 33 */ \ } -static void conv66(gsm_byte * d, wav_byte * c) { +static inline void conv66(gsm_byte * d, wav_byte * c) { gsm_byte frame_chain; unsigned int sr; unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4]; @@ -450,7 +452,7 @@ static void conv66(gsm_byte * d, wav_byte * c) { | (xmc[51] & 0x7); \ } -static void conv65( wav_byte * c, gsm_byte * d){ +static inline void conv65( wav_byte * c, gsm_byte * d){ unsigned int sr = 0; unsigned int frame_chain; |