From ad7cc96015ffcc6ab015124d6cff045cb43a2ac2 Mon Sep 17 00:00:00 2001
From: Mathieu Rene <mrene@avgs.ca>
Date: Fri, 15 Jan 2010 17:35:26 +0000
Subject: [PATCH] revert

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16321 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/codecs/mod_g729/Makefile   | 8 +++++---
 src/mod/codecs/mod_g729/mod_g729.c | 2 +-
 src/switch_core_sqldb.c            | 3 ---
 src/switch_ivr_originate.c         | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index a669c2a298..3e2a31a355 100644
--- 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 790dd50a9e..b3e0fe8e68 100644
--- 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 2234340573..9867c79f05 100644
--- 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 7135ae5ff5..21a79f6393 100644
--- 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);