[zaptel-commits] bweschke: trunk r1612 - in /trunk: ./ zaptel.c

[zaptel-commits at lists.digium.com]

Author: bweschke
Date: Thu Nov 16 22:17:05 2006
New Revision: 1612

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1612
Log:
Merged revisions 1611 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1611 | bweschke | 2006-11-16 23:12:38 -0500 (Thu, 16 Nov 2006) | 12 lines

Merged revisions 1610 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1610 | bweschke | 2006-11-16 23:06:05 -0500 (Thu, 16 Nov 2006) | 4 lines

 mattf - I'm not sure if this is where you wanted the definitions placed. 
 If not, please fix, but this gets the compiles working again for now.


........

................

Modified:
    trunk/   (props changed)
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Nov 16 22:17:05 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=1612&r1=1611&r2=1612
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Thu Nov 16 22:17:05 2006
@@ -4689,6 +4689,9 @@
 int zt_unregister(struct zt_span *span)
 {
 	int x;
+	int new_maxspans;
+	static struct zt_span *new_master;
+
 #ifdef CONFIG_PROC_FS
 	char tempfile[17];
 #endif /* CONFIG_PROC_FS */