[asterisk-commits] russell: branch russell/ast_channel_ao2 r189669 - in /team/russell/ast_channe...

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Apr 21 11:14:10 2009
New Revision: 189669

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189669
Log:
sync with trunk

Modified:
    team/russell/ast_channel_ao2/   (props changed)
    team/russell/ast_channel_ao2/utils/muted.c

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 21 11:14:10 2009
@@ -1,1 +1,1 @@
-/trunk:1-189655
+/trunk:1-189668

Modified: team/russell/ast_channel_ao2/utils/muted.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/utils/muted.c?view=diff&rev=189669&r1=189668&r2=189669
==============================================================================
--- team/russell/ast_channel_ao2/utils/muted.c (original)
+++ team/russell/ast_channel_ao2/utils/muted.c Tue Apr 21 11:14:10 2009
@@ -684,6 +684,7 @@
 		fclose(astf);
 		exit(1);
 	}
+#if HAVE_WORKING_FORK
 	if (needfork) {
 #ifndef HAVE_SBIN_LAUNCHD
 		if (daemon(0,0) < 0) {
@@ -695,6 +696,7 @@
 		exit(1);
 #endif
 	}
+#endif
 	for(;;) {
 		if (wait_event()) {
 			fclose(astf);