[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2f3c8ab9fecd676ea8ba955022dde0b4ec4adcc9 (commit)
      from  08ef6e2c7c84cb48fe7fa0c4eec503239ef401ee (commit)

Summary of changes:
 src/CMakeLists.txt   |    2 +-
 src/PJSipManager.cpp |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 2f3c8ab9fecd676ea8ba955022dde0b4ec4adcc9
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 17:18:58 2010 -0300

    Change linking order so that the linker doesn't try to be smart, and add a needed return value.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index afd1c94..0b2c3f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,8 +30,8 @@ hydra_component_add_ice_libraries(SipChannelService IceStorm)
 hydra_component_add_boost_libraries(SipChannelService thread core)
 hydra_component_build_standalone(SipChannelService)
 
-pjproject_link(SipChannelService pjlib)
 pjproject_link(SipChannelService pjlib-util)
+pjproject_link(SipChannelService pjlib)
 pjproject_link(SipChannelService pjsip)
 
 
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 2e65b34..8b2d7de 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -23,6 +23,8 @@ static void *monitorThread(void *endpt)
 		// let's just go with it.
 		pjsip_endpt_handle_events(endpoint, NULL);
 	}
+
+	return NULL;
 }
 
 PJSipManager *PJSipManager::getInstance()

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git