aboutsummaryrefslogtreecommitdiffstats
path: root/formats/msgsm.h
diff options
context:
space:
mode:
authormatteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b>2003-03-07 06:00:13 +0000
committermatteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b>2003-03-07 06:00:13 +0000
commit6cef720265d690adb0270c833a0b05a515bad810 (patch)
tree9cf97910c36b158e27853b640770c246ff9e8066 /formats/msgsm.h
parent005002c26620c61597ef18c19707c150b72ffccb (diff)
Fri Mar 7 07:00:00 CET 2003
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@634 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/msgsm.h')
-rwxr-xr-xformats/msgsm.h6
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;