[asterisk-commits] branch oej/test-this-branch r17069 - in /team/oej/test-this-branch: ./ includ...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Apr  3 09:36:21 2006
New Revision: 17069

URL: http://svn.digium.com/view/asterisk?rev=17069&view=rev
Log:
Fix compilation of manager

Modified:
    team/oej/test-this-branch/include/asterisk/manager.h
    team/oej/test-this-branch/manager.c

Modified: team/oej/test-this-branch/include/asterisk/manager.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/manager.h?rev=17069&r1=17068&r2=17069&view=diff
==============================================================================
--- team/oej/test-this-branch/include/asterisk/manager.h (original)
+++ team/oej/test-this-branch/include/asterisk/manager.h Mon Apr  3 09:36:21 2006
@@ -136,7 +136,7 @@
 	struct ast_manager_user *next;
 };
 
-static struct mansession {
+struct mansession {
 	/*! Execution thread */
 	pthread_t t;
 	/*! Thread lock -- don't use in action callbacks, it's already taken care of  */
@@ -180,7 +180,7 @@
 	/* Timeout for ast_carefulwrite() */
 	int writetimeout;
 	struct mansession *next;
-} *sessions = NULL;
+};
 
 struct message {
 	int hdrcount;

Modified: team/oej/test-this-branch/manager.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/manager.c?rev=17069&r1=17068&r2=17069&view=diff
==============================================================================
--- team/oej/test-this-branch/manager.c (original)
+++ team/oej/test-this-branch/manager.c Mon Apr  3 09:36:21 2006
@@ -526,7 +526,6 @@
 	{ { "show", "manager", "connected", NULL },
 	handle_showmanconn, "Show connected manager interface users", showmanconn_help };
 
-<<<<<<< .working
 
 static int handle_showmanager(int fd, int argc, char *argv[])
 {