kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8047: [build] fix build errors in mod_oreka, and mod_sangoma_codec due to using __FUNCTION__ on newer compilers

This commit is contained in:
Michael Jerris 2015-08-26 09:28:54 -04:00
parent 0d3c4870f3
commit 781959230b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_oreka/mod_oreka.c
View File

@ -454,7 +454,7 @@ static switch_bool_t oreka_audio_callback(switch_media_bug_t *bug, void *user_da
for (i = 0; i < linear_len / sizeof(int16_t); i++) { for (i = 0; i < linear_len / sizeof(int16_t); i++) {
pcmu_data[i] = linear_to_ulaw(linear_samples[i]); pcmu_data[i] = linear_to_ulaw(linear_samples[i]);
} }
pcmu_frame.source = __FUNCTION__; pcmu_frame.source = __SWITCH_FUNC__;
pcmu_frame.data = pcmu_data; pcmu_frame.data = pcmu_data;
pcmu_frame.datalen = i; pcmu_frame.datalen = i;
pcmu_frame.payload = 0; pcmu_frame.payload = 0;
@ -515,7 +515,7 @@ static switch_bool_t oreka_audio_callback(switch_media_bug_t *bug, void *user_da
for (i = 0; i < linear_len / sizeof(int16_t); i++) { for (i = 0; i < linear_len / sizeof(int16_t); i++) {
pcmu_data[i] = linear_to_ulaw(linear_samples[i]); pcmu_data[i] = linear_to_ulaw(linear_samples[i]);
} }
pcmu_frame.source = __FUNCTION__; pcmu_frame.source = __SWITCH_FUNC__;
pcmu_frame.data = pcmu_data; pcmu_frame.data = pcmu_data;
pcmu_frame.datalen = i; pcmu_frame.datalen = i;
pcmu_frame.payload = 0; pcmu_frame.payload = 0;

3
src/mod/applications/mod_redis/credis.c
View File

@ -67,6 +67,9 @@
#define CR_VERSION_STRING_SIZE_STR STRINGIFY(CREDIS_VERSION_STRING_SIZE) #define CR_VERSION_STRING_SIZE_STR STRINGIFY(CREDIS_VERSION_STRING_SIZE)
#ifdef PRINTDEBUG #ifdef PRINTDEBUG
#if !defined(_MSC_VER) && !defined(__FUNCTION__)
#define __FUNCTION__ (const char *)__func__
#endif
/* add -DPRINTDEBUG to CPPFLAGS in Makefile for debug outputs */ /* add -DPRINTDEBUG to CPPFLAGS in Makefile for debug outputs */
#define DEBUG(...) \ #define DEBUG(...) \
do { \ do { \

4
src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
View File

@ -510,7 +510,7 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
/* do the writing */ /* do the writing */
memset(&linear_frame, 0, sizeof(linear_frame)); memset(&linear_frame, 0, sizeof(linear_frame));
linear_frame.source = __FUNCTION__; linear_frame.source = __SWITCH_FUNC__;
linear_frame.data = decoded_byteswapped_data; linear_frame.data = decoded_byteswapped_data;
linear_frame.datalen = decoded_data_len; linear_frame.datalen = decoded_data_len;
linear_frame.payload = linear_payload; linear_frame.payload = linear_payload;
@ -720,7 +720,7 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec, /* codec ses
/* do the writing */ /* do the writing */
memset(&encoded_frame, 0, sizeof(encoded_frame)); memset(&encoded_frame, 0, sizeof(encoded_frame));
encoded_frame.source = __FUNCTION__; encoded_frame.source = __SWITCH_FUNC__;
encoded_frame.data = encoded_data; encoded_frame.data = encoded_data;
encoded_frame.datalen = encoded_data_len; encoded_frame.datalen = encoded_data_len;
encoded_frame.payload = codec->implementation->ianacode; encoded_frame.payload = codec->implementation->ianacode;