From cd889c7d9b41e8d587c03250b1a1a1cece2b4b08 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 25 Oct 2017 22:54:46 -0400 Subject: [PATCH] try to work with libical1 and libical2 --- citadel/modules/calendar/serv_calendar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index 5fc4bffc4..4e296fd4a 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -2580,8 +2580,12 @@ CTDL_MODULE_INIT(calendar) { /* Tell libical to return errors instead of aborting if it gets bad data */ - // icalerror_errors_are_fatal = 0; (this was the old way) + +#ifdef LIBICAL_ICAL_EXPORT // cheap and sleazy way to detect libical >=2.0 icalerror_set_errors_are_fatal(0); +#else + icalerror_errors_are_fatal = 0; (this was the old way) +#endif /* Use our own application prefix in tzid's generated from system tzdata */ icaltimezone_set_tzid_prefix("/citadel.org/"); -- 2.30.2