[asterisk-commits] mmichelson: branch group/CCSS r233476 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Dec  7 12:10:40 2009
New Revision: 233476

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233476
Log:
Change the #define to the appropriate value.


Modified:
    team/group/CCSS/channels/chan_sip.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=233476&r1=233475&r2=233476
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Mon Dec  7 12:10:40 2009
@@ -1959,7 +1959,7 @@
 	const esc_publish_callback remove_handler;
 };
 
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 static int cc_esc_publish_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry);
 
 static const struct sip_esc_publish_callbacks cc_esc_publish_callbacks = {
@@ -1986,14 +1986,14 @@
 	const struct sip_esc_publish_callbacks *callbacks;
 	struct ao2_container *compositor;
 } event_state_compositors [] = {
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 	{CALL_COMPLETION, "call-completion", &cc_esc_publish_callbacks},
 #endif
 };
 
 static const int ESC_MAX_BUCKETS = 37;
 
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 /* I don't actually know if I'll need to do anything here yet,
  * but this helps to fit the skeleton that I've designed for
  * PUBLISH support
@@ -2033,7 +2033,7 @@
 	if (esc_entry->sched_id > -1) {
 		AST_SCHED_DEL(sched, esc_entry->sched_id);
 	}
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 	if (!strcasecmp(esc_entry->event, "call-completion")) {
 		cc_esc_destructor(esc_entry);
 	}
@@ -2112,7 +2112,7 @@
 	esc_entry->event = esc->name;
 
 	switch (esc->event) {
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 	case CALL_COMPLETION:
 		cc_esc_init(esc_entry, req);
 		break;
@@ -23332,7 +23332,7 @@
 	return SIP_PUBLISH_UNKNOWN;
 }
 
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 static int pidf_validate_tuple(struct ast_xml_node *tuple_node)
 {
 	const char *id;
@@ -23567,7 +23567,7 @@
 	return 0;
 }
 
-#endif /* HAVE_XML */
+#endif /* HAVE_LIBXML2 */
 
 static int handle_sip_publish_initial(struct sip_pvt *p, struct sip_request *req, struct event_state_compositor *esc, const int expires)
 {
@@ -28253,7 +28253,7 @@
 
 static int sip_is_xml_parsable(void)
 {
-#ifdef HAVE_XML
+#ifdef HAVE_LIBXML2
 	return TRUE;
 #else
 	return FALSE;