From 35f55e20d7aa85482bcefbefb36a7ee1eea26538 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Wed, 11 Nov 2009 09:49:18 -0500
Subject: [PATCH] [#2284] Remove redefinition warnings + speex warnings
---
.../libs/pjproject/pjlib/include/pj/compat/string.h | 4 ++--
sflphone-common/src/audio/codecs/speexcodec_nb.cpp | 2 +-
sflphone-common/src/audio/codecs/speexcodec_wb.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
index 198fbe9850..e0ceb53f89 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
@@ -52,8 +52,8 @@
# define wcsicmp _wcsicmp
# define wcsnicmp _wcsnicmp
#else
-# define stricmp strcasecmp
-# define strnicmp strncasecmp
+// # define stricmp strcasecmp
+// # define strnicmp strncasecmp
# if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
# error "Implement Unicode string functions"
diff --git a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
index fc3784eb9c..a2603fc827 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
@@ -111,7 +111,7 @@ class Speex : public AudioCodec
virtual int codecDecode (short *dst, unsigned char *src, unsigned int size) {
- int ratio = 320 / _speex_frame_size;
+ // int ratio = 320 / _speex_frame_size;
speex_bits_read_from (&_speex_dec_bits, (char*) src, size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
diff --git a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
index 688ad6cf75..9d3b618674 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
@@ -109,7 +109,7 @@ class Speex : public AudioCodec
virtual int codecDecode (short *dst, unsigned char *src, unsigned int size) {
- int ratio = 320 / _speex_frame_size;
+ // int ratio = 320 / _speex_frame_size;
speex_bits_read_from (&_speex_dec_bits, (char*) src, size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
--
GitLab