diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-05-01 22:05:41 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-05-01 22:05:41 +0000 |
| commit | 810416dab92eeb54a9b01221ee9ff262305b13b5 (patch) | |
| tree | 0533e6ed07a6a7009f00faa33569cf0189d502db /pjmedia | |
| parent | 22cebb12bd93ddd25b80048c72473a55f14ed6df (diff) | |
Fixed #1064:
- Removed orphaned third_party/gsm/inc/gsm.h.orig file
- Added support for external GSM header in /usr/include/gsm.h (rather than <gsm/gsm.h>)
Thanks Christopher Zimmermann for the fixes
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3158 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config_auto.h.in | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-codec/config_auto.h.in b/pjmedia/include/pjmedia-codec/config_auto.h.in index 19264270..9c2a9af2 100644 --- a/pjmedia/include/pjmedia-codec/config_auto.h.in +++ b/pjmedia/include/pjmedia-codec/config_auto.h.in @@ -43,6 +43,8 @@ #endif #undef PJMEDIA_EXTERNAL_GSM_CODEC +#undef PJMEDIA_EXTERNAL_GSM_GSM_H +#undef PJMEDIA_EXTERNAL_GSM_H /* Speex codec */ #ifndef PJMEDIA_HAS_SPEEX_CODEC diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 11252137..83593d6c 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -35,7 +35,13 @@ #if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0 #if defined(PJMEDIA_EXTERNAL_GSM_CODEC) && PJMEDIA_EXTERNAL_GSM_CODEC +# if PJMEDIA_EXTERNAL_GSM_GSM_H # include <gsm/gsm.h> +# elif PJMEDIA_EXTERNAL_GSM_H +# include <gsm.h> +# else +# error Please set the location of gsm.h +# endif #else # include "../../third_party/gsm/inc/gsm.h" #endif |