[asterisk-commits] qwell: branch group/pimp_my_sip r382914 - in /team/group/pimp_my_sip: ./ chan...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Mar 12 14:21:33 CDT 2013
Author: qwell
Date: Tue Mar 12 14:21:29 2013
New Revision: 382914
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382914
Log:
Use external pjproject libraries everywhere.
Stop redefining bzero(). Use proper #include locations. Add dependency on
pjproject.
Modified:
team/group/pimp_my_sip/channels/Makefile
team/group/pimp_my_sip/channels/chan_gulp.c
team/group/pimp_my_sip/configure
team/group/pimp_my_sip/res/Makefile
team/group/pimp_my_sip/res/res_sip.c
team/group/pimp_my_sip/res/res_sip/config_auth.c
team/group/pimp_my_sip/res/res_sip/config_transport.c
team/group/pimp_my_sip/res/res_sip/sip_configuration.c
team/group/pimp_my_sip/res/res_sip/sip_distributor.c
team/group/pimp_my_sip/res/res_sip/sip_options.c
team/group/pimp_my_sip/res/res_sip_acl.c
team/group/pimp_my_sip/res/res_sip_authenticator_digest.c
team/group/pimp_my_sip/res/res_sip_endpoint_identifier_constant.c
team/group/pimp_my_sip/res/res_sip_endpoint_identifier_ip.c
team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c
team/group/pimp_my_sip/res/res_sip_logger.c
team/group/pimp_my_sip/res/res_sip_rfc3326.c
team/group/pimp_my_sip/res/res_sip_sdp_audio.c
team/group/pimp_my_sip/res/res_sip_session.c
Modified: team/group/pimp_my_sip/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/channels/Makefile?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/channels/Makefile (original)
+++ team/group/pimp_my_sip/channels/Makefile Tue Mar 12 14:21:29 2013
@@ -114,10 +114,3 @@
h323/libchanh323.a: h323/Makefile.ast
$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
-../res/pjproject/build.mak:
- cd ../res/pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
-
-include ../res/pjproject/build.mak
-
-chan_gulp.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-
Modified: team/group/pimp_my_sip/channels/chan_gulp.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/channels/chan_gulp.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/channels/chan_gulp.c (original)
+++ team/group/pimp_my_sip/channels/chan_gulp.c Tue Mar 12 14:21:29 2013
@@ -26,6 +26,7 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<depend>res_sip</depend>
<depend>res_sip_session</depend>
<support_level>core</support_level>
@@ -33,11 +34,9 @@
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjsip_ua.h"
-#include "pjlib.h"
+#include <pjsip.h>
+#include <pjsip_ua.h>
+#include <pjlib.h>
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/group/pimp_my_sip/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/Makefile?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/Makefile (original)
+++ team/group/pimp_my_sip/res/Makefile Tue Mar 12 14:21:29 2013
@@ -44,7 +44,7 @@
ael/ael_lex.o ael/ael.tab.o ael/pval.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ael_share)
$(if $(filter res_sip,$(EMBEDDED_MODS)),modules.link,res_sip.so): $(subst .c,.o,$(wildcard res_sip/*.c))
-$(subst .c,.o,$(wildcard res_sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_sip) $(PJ_CFLAGS)
+$(subst .c,.o,$(wildcard res_sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_sip)
ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
ael/ael_lex.c: ael/ael.flex
Modified: team/group/pimp_my_sip/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip.c (original)
+++ team/group/pimp_my_sip/res/res_sip.c Tue Mar 12 14:21:29 2013
@@ -17,12 +17,11 @@
*/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
+
+#include <pjsip.h>
/* Needed for SUBSCRIBE, NOTIFY, and PUBLISH method definitions */
-#include "pjsip_simple.h"
-#include "pjlib.h"
+#include <pjsip_simple.h>
+#include <pjlib.h>
#include "asterisk/res_sip.h"
#include "res_sip/include/res_sip_private.h"
@@ -38,6 +37,7 @@
#include "asterisk/sorcery.h"
/*** MODULEINFO
+ <depend>pjproject</depend>
<depend>res_sorcery_config</depend>
<support_level>core</support_level>
***/
Modified: team/group/pimp_my_sip/res/res_sip/config_auth.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/config_auth.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/config_auth.c (original)
+++ team/group/pimp_my_sip/res/res_sip/config_auth.c Tue Mar 12 14:21:29 2013
@@ -18,10 +18,8 @@
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjlib.h"
+#include <pjsip.h>
+#include <pjlib.h>
#include "asterisk/res_sip.h"
#include "asterisk/logger.h"
#include "asterisk/sorcery.h"
Modified: team/group/pimp_my_sip/res/res_sip/config_transport.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/config_transport.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/config_transport.c (original)
+++ team/group/pimp_my_sip/res/res_sip/config_transport.c Tue Mar 12 14:21:29 2013
@@ -17,10 +17,9 @@
*/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjlib.h"
+
+#include <pjsip.h>
+#include <pjlib.h>
#include "asterisk/res_sip.h"
#include "asterisk/logger.h"
Modified: team/group/pimp_my_sip/res/res_sip/sip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/sip_configuration.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/sip_configuration.c (original)
+++ team/group/pimp_my_sip/res/res_sip/sip_configuration.c Tue Mar 12 14:21:29 2013
@@ -7,10 +7,8 @@
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjsip_ua.h"
+#include <pjsip.h>
+#include <pjsip_ua.h>
#include "asterisk/res_sip.h"
#include "include/res_sip_private.h"
Modified: team/group/pimp_my_sip/res/res_sip/sip_distributor.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/sip_distributor.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/sip_distributor.c (original)
+++ team/group/pimp_my_sip/res/res_sip/sip_distributor.c Tue Mar 12 14:21:29 2013
@@ -17,9 +17,8 @@
*/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
+
+#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip/sip_options.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip/sip_options.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip/sip_options.c (original)
+++ team/group/pimp_my_sip/res/res_sip/sip_options.c Tue Mar 12 14:21:29 2013
@@ -7,11 +7,9 @@
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjsip_ua.h"
-#include "pjlib.h"
+#include <pjsip.h>
+#include <pjsip_ua.h>
+#include <pjlib.h>
#include "asterisk/res_sip.h"
#include "asterisk/channel.h"
Modified: team/group/pimp_my_sip/res/res_sip_acl.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_acl.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_acl.c (original)
+++ team/group/pimp_my_sip/res/res_sip_acl.c Tue Mar 12 14:21:29 2013
@@ -17,13 +17,12 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip_authenticator_digest.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_authenticator_digest.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_authenticator_digest.c (original)
+++ team/group/pimp_my_sip/res/res_sip_authenticator_digest.c Tue Mar 12 14:21:29 2013
@@ -17,9 +17,8 @@
*/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
+
+#include <pjsip.h>
#include "asterisk/res_sip.h"
#include "asterisk/logger.h"
@@ -27,6 +26,7 @@
#include "asterisk/strings.h"
/*** MODULEINFO
+ <depend>pjproject</depend>
<depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/group/pimp_my_sip/res/res_sip_endpoint_identifier_constant.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_endpoint_identifier_constant.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_endpoint_identifier_constant.c (original)
+++ team/group/pimp_my_sip/res/res_sip_endpoint_identifier_constant.c Tue Mar 12 14:21:29 2013
@@ -19,14 +19,13 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<defaultenabled>no</defaultenabled>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_endpoint_identifier_ip.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_endpoint_identifier_ip.c (original)
+++ team/group/pimp_my_sip/res/res_sip_endpoint_identifier_ip.c Tue Mar 12 14:21:29 2013
@@ -17,13 +17,12 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c (original)
+++ team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c Tue Mar 12 14:21:29 2013
@@ -17,13 +17,12 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip_logger.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_logger.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_logger.c (original)
+++ team/group/pimp_my_sip/res/res_sip_logger.c Tue Mar 12 14:21:29 2013
@@ -17,13 +17,12 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include "asterisk/res_sip.h"
Modified: team/group/pimp_my_sip/res/res_sip_rfc3326.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_rfc3326.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_rfc3326.c (original)
+++ team/group/pimp_my_sip/res/res_sip_rfc3326.c Tue Mar 12 14:21:29 2013
@@ -17,13 +17,12 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
#include <pjsip.h>
#include <pjsip_ua.h>
Modified: team/group/pimp_my_sip/res/res_sip_sdp_audio.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_sdp_audio.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_sdp_audio.c (original)
+++ team/group/pimp_my_sip/res/res_sip_sdp_audio.c Tue Mar 12 14:21:29 2013
@@ -24,6 +24,7 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<depend>res_sip</depend>
<depend>res_sip_session</depend>
<support_level>core</support_level>
@@ -31,12 +32,10 @@
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjsip_ua.h"
-#include "pjmedia.h"
-#include "pjlib.h"
+#include <pjsip.h>
+#include <pjsip_ua.h>
+#include <pjmedia.h>
+#include <pjlib.h>
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/group/pimp_my_sip/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_session.c?view=diff&rev=382914&r1=382913&r2=382914
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_session.c (original)
+++ team/group/pimp_my_sip/res/res_sip_session.c Tue Mar 12 14:21:29 2013
@@ -17,17 +17,16 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
<depend>res_sip</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
-#undef bzero
-#define bzero bzero
-#include "pjsip.h"
-#include "pjsip_ua.h"
-#include "pjlib.h"
+#include <pjsip.h>
+#include <pjsip_ua.h>
+#include <pjlib.h>
#include "asterisk/res_sip_session.h"
#include "asterisk/datastore.h"
More information about the asterisk-commits
mailing list