aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-28 22:54:03 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-28 22:54:03 +0000
commit0cff654a6951abdf1310df3f14ad88914ad5d43c (patch)
tree4598231a4295feb0a052960a44db2722a1f16dbe /res
parent5696c8402789c5f835bc4428c3bea8204cf01352 (diff)
Fix ical library handling (again)
Newer versions of libical (which we require) store the header file in a libical/ subfolder and include an ical.h file that does a #warning for deprecation and then #includes <libical/ical.h>. Since we now test for libical/ical.h, we can change the #includes back to <libical/ical.h> and remove the test which specifically adds /usr/include/libical as an include directory. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@266386 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_calendar_caldav.c2
-rw-r--r--res/res_calendar_icalendar.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index 63b6a6ba6..583b4b1de 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -29,7 +29,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <ical.h>
+#include <libical/ical.h>
#include <ne_session.h>
#include <ne_uri.h>
#include <ne_request.h>
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 8c0966528..34a8b101b 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -28,7 +28,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <ical.h>
+#include <libical/ical.h>
#include <ne_session.h>
#include <ne_uri.h>
#include <ne_request.h>