summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2007-04-15 10:31:10 +0000
committerBenny Prijono <bennylp@teluu.com>2007-04-15 10:31:10 +0000
commit7db443667214cdc09b0ef9c9c1e963f0bdc34cb9 (patch)
tree30d86c0d60c3fe5c5a22bcf7ca76608eee91f4fe
parent1e80be89bec5b2b287a742627051bb91938abc41 (diff)
Fixed ticket #227: Unresolved error in alaw/ulaw conversion with C++ build (thanks Alain Totouom)
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/pjproject-0.5-stable@1197 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/include/pjmedia/alaw_ulaw.h4
-rw-r--r--pjmedia/src/pjmedia/alaw_ulaw.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/pjmedia/include/pjmedia/alaw_ulaw.h b/pjmedia/include/pjmedia/alaw_ulaw.h
index 5cafa842..14f10495 100644
--- a/pjmedia/include/pjmedia/alaw_ulaw.h
+++ b/pjmedia/include/pjmedia/alaw_ulaw.h
@@ -21,6 +21,8 @@
#include <pjmedia/types.h>
+PJ_BEGIN_DECL
+
#if defined(PJMEDIA_HAS_ALAW_ULAW_TABLE) && PJMEDIA_HAS_ALAW_ULAW_TABLE!=0
extern const pj_uint8_t pjmedia_linear2ulaw_tab[16384];
@@ -134,9 +136,9 @@ PJ_DECL(unsigned char) pjmedia_alaw2ulaw(unsigned char aval);
*/
PJ_DECL(unsigned char) pjmedia_ulaw2alaw(unsigned char uval);
-
#endif
+PJ_END_DECL
#endif /* __PJMEDIA_ALAW_ULAW_H__ */
diff --git a/pjmedia/src/pjmedia/alaw_ulaw.c b/pjmedia/src/pjmedia/alaw_ulaw.c
index 1841192a..5fd97479 100644
--- a/pjmedia/src/pjmedia/alaw_ulaw.c
+++ b/pjmedia/src/pjmedia/alaw_ulaw.c
@@ -154,7 +154,7 @@ pjmedia_linear2alaw(
*/
PJ_DEF(int)
pjmedia_alaw2linear(
- unsigned char a_val)
+ unsigned a_val)
{
int t;
int seg;