revert

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16321 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index a669c2a29898229b7f26d86a0fb9101ae48204f9..3e2a31a35572ddbc35fbe2d55ca0ecac016cbf4e 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,7 +1,9 @@
 BASE=../../../..
-DIR=$(BASE)/libs/libg729
-A=$(DIR)/.libs/libg729.a
 
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include -I${DIR}" ; else echo "-DG729_PASSTHROUGH" ; fi ;
+DIR=$(switch_srcdir)/libs/libg729
+BUILDDIR=$(switch_builddir)/libs/libg729
+A=$(BUILDDIR)/.libs/libg729.a
+
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
 include $(BASE)/build/modmake.rules

diff --git a/src/mod/codecs/mod_g729/mod_g729.c b/src/mod/codecs/mod_g729/mod_g729.c
index 790dd50a9e425ef44088a3285fae5caddc725e9e..b3e0fe8e68dee11c096d6e8d2f2e6077bdbfc5b7 100644 (file)
--- a/src/mod/codecs/mod_g729/mod_g729.c
+++ b/src/mod/codecs/mod_g729/mod_g729.c
@@ -38,7 +38,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load);
 SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
 
 #ifndef G729_PASSTHROUGH
-#include "g729ab.h"
+#include "g729.h"
 
 struct g729_context {
        struct dec_state decoder_object;

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 223434057356b476473ab4959fe63a9fe5ac6575..9867c79f0507649b88871eca7f52aa87468dee63 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1256,9 +1256,6 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
        
        switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool);
 
-       if (!manage) {
-               return SWITCH_STATUS_SUCCESS;
-       }
  top:
        
        /* Activate SQL database */

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 7135ae5ff57eb1a3ee97a0b4faeef253bee6e70f..21a79f63932f2f2681f5dab59248e4dc793271af 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -2609,7 +2609,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                                        switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel;
                                                        switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session;
                                                        switch_status_t b_status = SWITCH_STATUS_FALSE;
-                                                       switch_frame_t *b_frame = NULL;
+                                                       switch_frame_t *b_frame;
                                                        
                                                        if (b_channel && b_session) {
                                                                b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);