[asterisk-commits] trunk - r8186 in /trunk: ./ include/asterisk/ res/

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Wed Jan 18 09:42:48 2006
New Revision: 8186

URL: http://svn.digium.com/view/asterisk?rev=8186&view=rev
Log:
allows for use of the originate function from
the cli patch 5847

Added:
    trunk/res/res_clioriginate.c
      - copied unchanged from r8185, team/russell/cli_originate/res/res_clioriginate.c
Modified:
    trunk/   (props changed)
    trunk/include/asterisk/module.h
    trunk/res/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
    automerge = yes

Propchange: trunk/
------------------------------------------------------------------------------
    automerge-email = russell at digium.com

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: trunk/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/module.h?rev=8186&r1=8185&r2=8186&view=diff
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Wed Jan 18 09:42:48 2006
@@ -289,6 +289,10 @@
 #define LOCAL_USER_DECL AST_MUTEX_DEFINE_STATIC(localuser_lock); \
 						static struct localuser *localusers = NULL; \
 						static int localusecnt = 0;
+
+#define STANDARD_USECOUNT_DECL \
+	AST_MUTEX_DEFINE_STATIC(localuser_lock); \
+	static int localusecnt = 0;	
 
 #define STANDARD_INCREMENT_USECOUNT \
 	ast_mutex_lock(&localuser_lock); \

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=8186&r1=8185&r2=8186&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Wed Jan 18 09:42:48 2006
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so res_clioriginate.so
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
   ifneq (${OSARCH},FreeBSD)