From deba231143e76809b0dd683b77e9e48b543a72b4 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 10 Feb 2015 09:04:38 -0500 Subject: [PATCH] rename an old MP_ variable to RE_ --- daemon/.ycm_extra_conf.py | 2 +- daemon/Makefile | 2 +- daemon/main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/.ycm_extra_conf.py b/daemon/.ycm_extra_conf.py index f46cabb73..2a2b9d4fc 100644 --- a/daemon/.ycm_extra_conf.py +++ b/daemon/.ycm_extra_conf.py @@ -23,7 +23,7 @@ flags = [ '-D_GNU_SOURCE', '-D__DEBUG=1', '-DRTPENGINE_VERSION="dummy"', -'-DMP_PLUGIN_DIR="/usr/lib/rtpengine"', +'-DRE_PLUGIN_DIR="/usr/lib/rtpengine"', '-O2', '-fstack-protector', '--param=ssp-buffer-size=4', diff --git a/daemon/Makefile b/daemon/Makefile index 24d0637b6..cd2f1e670 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -29,7 +29,7 @@ ifeq ($(RTPENGINE_VERSION),) endif CFLAGS+= -DRTPENGINE_VERSION="\"$(RTPENGINE_VERSION)\"" -CFLAGS+= -DMP_PLUGIN_DIR="\"/usr/lib/rtpengine\"" +CFLAGS+= -DRE_PLUGIN_DIR="\"/usr/lib/rtpengine\"" #CFLAGS+= -DSRTCP_KEY_DERIVATION_RFC_COMPLIANCE #CFLAGS+= -DTERMINATE_SDP_AT_BLANK_LINE diff --git a/daemon/main.c b/daemon/main.c index 50da00044..e7f433c3f 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -596,8 +596,8 @@ no_kernel: } if (redis_ip) { - dlh = dlopen(MP_PLUGIN_DIR "/rtpengine-redis.so", RTLD_NOW | RTLD_GLOBAL); - if (!dlh && !g_file_test(MP_PLUGIN_DIR "/rtpengine-redis.so", G_FILE_TEST_IS_REGULAR) + dlh = dlopen(RE_PLUGIN_DIR "/rtpengine-redis.so", RTLD_NOW | RTLD_GLOBAL); + if (!dlh && !g_file_test(RE_PLUGIN_DIR "/rtpengine-redis.so", G_FILE_TEST_IS_REGULAR) && g_file_test("../../rtpengine-redis/redis.so", G_FILE_TEST_IS_REGULAR)) dlh = dlopen("../../rtpengine-redis/redis.so", RTLD_NOW | RTLD_GLOBAL); if (!dlh)