[asterisk-commits] branch oej/test-this-branch r12044 - in /team/oej/test-this-branch: ./ res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar  6 05:34:28 2006
New Revision: 12044

URL: http://svn.digium.com/view/asterisk?rev=12044&view=rev
Log:
reset automerge

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/channel.c
    team/oej/test-this-branch/res/Makefile
    team/oej/test-this-branch/utils.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = Erik

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar  6 05:34:28 2006
@@ -1,1 +1,1 @@
-/trunk:1-12006
+/trunk:1-12043

Modified: team/oej/test-this-branch/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channel.c?rev=12044&r1=12043&r2=12044&view=diff
==============================================================================
--- team/oej/test-this-branch/channel.c (original)
+++ team/oej/test-this-branch/channel.c Mon Mar  6 05:34:28 2006
@@ -2127,7 +2127,7 @@
 		if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP)
 			done = 1;	/* force a break */
 		else if (f->frametype == AST_FRAME_TEXT) {		/* what we want */
-			buf = strndup((char *) f->data, f->datalen);	/* dup and break */
+			buf = ast_strndup((char *) f->data, f->datalen);	/* dup and break */
 			done = 1;
 		}
 		ast_frfree(f);

Modified: team/oej/test-this-branch/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/res/Makefile?rev=12044&r1=12043&r2=12044&view=diff
==============================================================================
--- team/oej/test-this-branch/res/Makefile (original)
+++ team/oej/test-this-branch/res/Makefile Mon Mar  6 05:34:28 2006
@@ -32,7 +32,9 @@
   MODS:=$(filter-out res_osp.so,$(MODS))
 endif
 
-# NetSNMP is incompatible with the BSDs, until the loader changes are complete (conflict with unload_module())
+# NETsnmp has some difficulties on some platforms (conflict with unload_module)
+# Until we figure out if the collission is version-specific or what to do
+# we have disabled res_snmp on OS/X and *BSD
 ifeq ($(OSARCH),Darwin)
   MODS:=$(filter-out res_snmp.so,$(MODS))
 else

Modified: team/oej/test-this-branch/utils.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/utils.c?rev=12044&r1=12043&r2=12044&view=diff
==============================================================================
--- team/oej/test-this-branch/utils.c (original)
+++ team/oej/test-this-branch/utils.c Mon Mar  6 05:34:28 2006
@@ -1022,7 +1022,11 @@
 	va_list ap1, ap2;
 
 	va_start(ap1, format);
+#if defined(__FreeBSD__)
+	va_start(ap2, format);		/* va_copy does not exist on FreeBSD */
+#else
 	va_copy(ap2, ap1);
+#endif
 
 	needed = vsnprintf(mgr->pool->base + mgr->used, mgr->space, format, ap1) + 1;