[asterisk-commits] branch kpfleming/chanfunc r9474 - in /team/kpfleming/chanfunc: ./ channels/ f...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb 10 21:35:40 2006
New Revision: 9474

URL: http://svn.digium.com/view/asterisk?rev=9474&view=rev
Log:
update to trunk again

Modified:
    team/kpfleming/chanfunc/   (props changed)
    team/kpfleming/chanfunc/channels/chan_sip.c
    team/kpfleming/chanfunc/funcs/Makefile

Propchange: team/kpfleming/chanfunc/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 10 21:35:40 2006
@@ -1,1 +1,1 @@
-/trunk:1-9469
+/trunk:1-9473

Modified: team/kpfleming/chanfunc/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/channels/chan_sip.c?rev=9474&r1=9473&r2=9474&view=diff
==============================================================================
--- team/kpfleming/chanfunc/channels/chan_sip.c (original)
+++ team/kpfleming/chanfunc/channels/chan_sip.c Fri Feb 10 21:35:40 2006
@@ -11447,7 +11447,6 @@
 /*! \brief Start the channel monitor thread */
 static int restart_monitor(void)
 {
-	pthread_attr_t attr;
 	/* If we're supposed to be stopped -- stay stopped */
 	if (monitor_thread == AST_PTHREADT_STOP)
 		return 0;
@@ -11465,7 +11464,7 @@
 		pthread_kill(monitor_thread, SIGURG);
 	} else {
 		/* Start a new monitor */
-		if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {
+		if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
 			ast_mutex_unlock(&monlock);
 			ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
 			return -1;

Modified: team/kpfleming/chanfunc/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/funcs/Makefile?rev=9474&r1=9473&r2=9474&view=diff
==============================================================================
--- team/kpfleming/chanfunc/funcs/Makefile (original)
+++ team/kpfleming/chanfunc/funcs/Makefile Fri Feb 10 21:35:40 2006
@@ -31,7 +31,7 @@
 all: $(FUNCS)
 
 clean:
-	rm -f *.so *.o .depend pbx_functions.h
+	rm -f *.so *.o .depend
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -50,7 +50,7 @@
 
 depend: .depend
 
-.depend: pbx_functions.h
+.depend:
 	../build_tools/mkdep $(CFLAGS) `ls *.c`
 
 env: