[svn-commits] russell: branch group/newcdr r201985 - in /team/group/newcdr: apps/ channels/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jun 19 14:04:55 CDT 2009
Author: russell
Date: Fri Jun 19 14:04:50 2009
New Revision: 201985
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201985
Log:
Untangle some headers, change return type on check_enabled()
Modified:
team/group/newcdr/apps/app_celgenuserevent.c
team/group/newcdr/apps/app_dial.c
team/group/newcdr/apps/app_directed_pickup.c
team/group/newcdr/apps/app_queue.c
team/group/newcdr/channels/chan_sip.c
team/group/newcdr/include/asterisk/cel.h
team/group/newcdr/include/asterisk/channel.h
team/group/newcdr/main/cel.c
team/group/newcdr/main/features.c
Modified: team/group/newcdr/apps/app_celgenuserevent.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_celgenuserevent.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/apps/app_celgenuserevent.c (original)
+++ team/group/newcdr/apps/app_celgenuserevent.c Fri Jun 19 14:04:50 2009
@@ -30,6 +30,7 @@
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/channel.h"
+#include "asterisk/cel.h"
/*** DOCUMENTATION
<application name="CELGenUserEvent" language="en_US">
Modified: team/group/newcdr/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_dial.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/apps/app_dial.c (original)
+++ team/group/newcdr/apps/app_dial.c Fri Jun 19 14:04:50 2009
@@ -61,6 +61,7 @@
#include "asterisk/stringfields.h"
#include "asterisk/global_datastores.h"
#include "asterisk/dsp.h"
+#include "asterisk/cel.h"
/*** DOCUMENTATION
<application name="Dial" language="en_US">
Modified: team/group/newcdr/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_directed_pickup.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/apps/app_directed_pickup.c (original)
+++ team/group/newcdr/apps/app_directed_pickup.c Fri Jun 19 14:04:50 2009
@@ -41,6 +41,7 @@
#include "asterisk/app.h"
#include "asterisk/features.h"
#include "asterisk/callerid.h"
+#include "asterisk/cel.h"
#define PICKUPMARK "PICKUPMARK"
Modified: team/group/newcdr/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_queue.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/apps/app_queue.c (original)
+++ team/group/newcdr/apps/app_queue.c Fri Jun 19 14:04:50 2009
@@ -95,6 +95,7 @@
#include "asterisk/global_datastores.h"
#include "asterisk/taskprocessor.h"
#include "asterisk/callerid.h"
+#include "asterisk/cel.h"
/*!
* \par Please read before modifying this file.
Modified: team/group/newcdr/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/channels/chan_sip.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/channels/chan_sip.c (original)
+++ team/group/newcdr/channels/chan_sip.c Fri Jun 19 14:04:50 2009
@@ -272,6 +272,7 @@
#include "asterisk/event.h"
#include "asterisk/tcptls.h"
#include "asterisk/stun.h"
+#include "asterisk/cel.h"
/*** DOCUMENTATION
<application name="SIPDtmfMode" language="en_US">
Modified: team/group/newcdr/include/asterisk/cel.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/include/asterisk/cel.h?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/include/asterisk/cel.h (original)
+++ team/group/newcdr/include/asterisk/cel.h Fri Jun 19 14:04:50 2009
@@ -34,11 +34,7 @@
#define AST_MAX_USER_FIELD 256
#define AST_MAX_ACCOUNT_CODE 20
-/* Include channel.h after relevant declarations it will need */
-#include "asterisk/channel.h"
-#include "asterisk/utils.h"
#include "asterisk/event.h"
-#include "asterisk/hashtab.h"
enum ast_cel_eventtype {
/*! channel birth */
@@ -93,8 +89,13 @@
CEL_FORWARD = 25,
};
-/*! \brief Return TRUE if CEL subsystem is enabled */
-int ast_cel_check_enabled(void);
+/*!
+ * \brief Check to see if CEL is enabled
+ *
+ * \retval zero not enabled
+ * \retval non-zero enabled
+ */
+unsigned int ast_cel_check_enabled(void);
/*!
* \brief Allocate a CEL record
Modified: team/group/newcdr/include/asterisk/channel.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/include/asterisk/channel.h?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/include/asterisk/channel.h (original)
+++ team/group/newcdr/include/asterisk/channel.h Fri Jun 19 14:04:50 2009
@@ -144,7 +144,6 @@
#include "asterisk/config.h"
#include "asterisk/lock.h"
#include "asterisk/cdr.h"
-#include "asterisk/cel.h"
#include "asterisk/utils.h"
#include "asterisk/linkedlists.h"
#include "asterisk/stringfields.h"
Modified: team/group/newcdr/main/cel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Fri Jun 19 14:04:50 2009
@@ -48,7 +48,7 @@
static char cel_dateformat[256];
-int ast_cel_check_enabled()
+unsigned int ast_cel_check_enabled(void)
{
return cel_enabled;
}
Modified: team/group/newcdr/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/features.c?view=diff&rev=201985&r1=201984&r2=201985
==============================================================================
--- team/group/newcdr/main/features.c (original)
+++ team/group/newcdr/main/features.c Fri Jun 19 14:04:50 2009
@@ -55,6 +55,7 @@
#include "asterisk/audiohook.h"
#include "asterisk/global_datastores.h"
#include "asterisk/astobj2.h"
+#include "asterisk/cel.h"
/*** DOCUMENTATION
<application name="Bridge" language="en_US">
More information about the svn-commits
mailing list