Index: res/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- res/Makefile	16 Nov 2005 20:49:44 -0000	1.31
+++ res/Makefile	24 Nov 2005 14:49:24 -0000
@@ -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)
Index: include/asterisk/module.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/module.h,v
retrieving revision 1.25
diff -u -r1.25 module.h
--- include/asterisk/module.h	28 Oct 2005 16:33:09 -0000	1.25
+++ include/asterisk/module.h	24 Nov 2005 14:49:25 -0000
@@ -290,6 +290,10 @@
 						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); \
 	localusecnt++; \