summaryrefslogtreecommitdiff
path: root/zaptel.c
diff options
context:
space:
mode:
authorbweschke <bweschke@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-11-17 04:17:05 +0000
committerbweschke <bweschke@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-11-17 04:17:05 +0000
commitb3fa83eee825735c6d6b487b6ded526b0c6a7a3f (patch)
tree3785722b775e58d0a757136b6f86a9ae65fac953 /zaptel.c
parent2494c875a8d4e3b2a5440b76c60095b0470fc614 (diff)
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. ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1612 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.c')
-rw-r--r--zaptel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/zaptel.c b/zaptel.c
index 97aecce..a178195 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -4689,6 +4689,9 @@ int zt_register(struct zt_span *span, int prefmaster)
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 */