FS-8047: [build] fix build errors in mod_oreka, and mod_sangoma_codec due to using...

diff --git a/src/mod/applications/mod_oreka/mod_oreka.c b/src/mod/applications/mod_oreka/mod_oreka.c
index a9c8c927e111bcee8b273d3002e3b7901e711559..66a6bc5c73d1ef79ceb03b2167c8200d370061cb 100644 (file)
--- a/src/mod/applications/mod_oreka/mod_oreka.c
+++ b/src/mod/applications/mod_oreka/mod_oreka.c
@@ -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++) {
                        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.datalen = i;
                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++) {
                         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.datalen = i;
                     pcmu_frame.payload = 0;

diff --git a/src/mod/applications/mod_redis/credis.c b/src/mod/applications/mod_redis/credis.c
index 653bb10b5c84e4069313e462bfc60a2fa49bccb7..997f79191f4eaa9a87123dccc257a0340a2d4af6 100644 (file)
--- a/src/mod/applications/mod_redis/credis.c
+++ b/src/mod/applications/mod_redis/credis.c
@@ -67,6 +67,9 @@
 #define CR_VERSION_STRING_SIZE_STR STRINGIFY(CREDIS_VERSION_STRING_SIZE)
 
 #ifdef PRINTDEBUG
+#if !defined(_MSC_VER) && !defined(__FUNCTION__)
+#define __FUNCTION__ (const char *)__func__
+#endif
 /* add -DPRINTDEBUG to CPPFLAGS in Makefile for debug outputs */
 #define DEBUG(...)                                 \
   do {                                             \

diff --git a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
index 231bb05189b29681b813561c0bf14eab52066f09..018a90ba151f24c17f4f525096d437092b26a0bf 100644 (file)
--- a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
+++ b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
@@ -510,7 +510,7 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 
        /* do the writing */
        memset(&linear_frame, 0, sizeof(linear_frame)); 
-       linear_frame.source = __FUNCTION__;
+       linear_frame.source = __SWITCH_FUNC__;
        linear_frame.data = decoded_byteswapped_data;
        linear_frame.datalen = decoded_data_len;
        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 */
        memset(&encoded_frame, 0, sizeof(encoded_frame));
-       encoded_frame.source = __FUNCTION__;
+       encoded_frame.source = __SWITCH_FUNC__;
        encoded_frame.data = encoded_data;
        encoded_frame.datalen = encoded_data_len;
        encoded_frame.payload = codec->implementation->ianacode;