diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-03-23 18:04:15 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-03-23 18:04:15 +0000 |
| commit | adbbd72dbe1e91f17c9d6051271a5814108cbac5 (patch) | |
| tree | 82ca73500c23f8e85d1f33f43330942e32b4d8a0 /pjmedia | |
| parent | 14824da601ff1b606a4bb0d891adb98940f60fce (diff) | |
Fixed misc warnings/errors in Solaris build
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@355 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/os-win32.mak | 3 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia.h | 1 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/silencedet.h | 7 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/errno.c | 5 |
5 files changed, 15 insertions, 3 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 9b347edb..7cf6012f 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -160,7 +160,7 @@ clean depend realclean: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ - @if test "$@" == "depend"; then \ + @if test "$@" = "depend"; then \ echo '$(PJMEDIA_LIB): .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjmedia-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak index ffd043b0..9a7c836b 100644 --- a/pjmedia/build/os-win32.mak +++ b/pjmedia/build/os-win32.mak @@ -13,8 +13,9 @@ export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ export OS_CFLAGS += -DPA_NO_ASIO -DPA_NO_DS # Example: -# to activate Null sound, uncomment this line below. +# to activate Null sound, uncomment these two lines below. #export SOUND_OBJS = $(NULLSOUND_OBJS) +#export OS_CFLAGS += $(CC_DEF)PJMEDIA_HAS_NULL_SOUND # Example: # to include only GSM and exclude Speex codec, uncomment the "export" line below. diff --git a/pjmedia/include/pjmedia.h b/pjmedia/include/pjmedia.h index 9a8c4237..8cdc0b72 100644 --- a/pjmedia/include/pjmedia.h +++ b/pjmedia/include/pjmedia.h @@ -38,6 +38,7 @@ #include <pjmedia/rtp.h> #include <pjmedia/sdp.h> #include <pjmedia/sdp_neg.h> +#include <pjmedia/silencedet.h> #include <pjmedia/session.h> #include <pjmedia/sound.h> #include <pjmedia/sound_port.h> diff --git a/pjmedia/include/pjmedia/silencedet.h b/pjmedia/include/pjmedia/silencedet.h index f251c082..4e823979 100644 --- a/pjmedia/include/pjmedia/silencedet.h +++ b/pjmedia/include/pjmedia/silencedet.h @@ -130,7 +130,14 @@ PJ_DECL(pj_bool_t) pjmedia_silence_det_apply( pjmedia_silence_det *sd, pj_uint32_t level); +/** + * Declaration linear2ulaw + */ +unsigned char linear2ulaw(int pcm_val); + + PJ_END_DECL + #endif /* __PJMEDIA_SILENCE_DET_H__ */ diff --git a/pjmedia/src/pjmedia/errno.c b/pjmedia/src/pjmedia/errno.c index 7ea7af8c..86c78d5f 100644 --- a/pjmedia/src/pjmedia/errno.c +++ b/pjmedia/src/pjmedia/errno.c @@ -145,6 +145,7 @@ PJ_DEF(pj_str_t) pjmedia_strerror( pj_status_t statcode, #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0) /* See if the error comes from PortAudio. */ +#if defined(PJMEDIA_HAS_PORTAUDIO_SOUND) && PJMEDIA_HAS_PORTAUDIO_SOUND!=0 if (statcode >= PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized) && statcode < PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized + 10000)) { @@ -159,7 +160,9 @@ PJ_DEF(pj_str_t) pjmedia_strerror( pj_status_t statcode, pj_strncpy_with_null(&errstr, &msg, bufsize); return errstr; - } else if (statcode >= PJMEDIA_ERRNO_START && + } else +#endif /* PJMEDIA_HAS_PORTAUDIO_SOUND */ + if (statcode >= PJMEDIA_ERRNO_START && statcode < PJMEDIA_ERRNO_START + PJ_ERRNO_SPACE_SIZE) { /* Find the error in the table. |