ical_file.cmake: Fix ICAL_CHECK_VERSION macro #335
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The inclusion of the icalversion.h header in ical.h breaks the ICAL_CHECK_VERSION macro because all the \ line continuation characters are converted to ;. This makes the macro useless. Wrapping for the sake of readability, it currently looks like this: #define ICAL_CHECK_VERSION(major,minor,micro) ; (ICAL_MAJOR_VERSION > (major) || ; (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION > (minor)) || ; (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION == (minor) && ; ICAL_MICRO_VERSION >= (micro))) Setting the STRINGS NEWLINE_CONSUME option keeps the original structure instead of terminating the lines.
dbnicholson
force-pushed
the
fix-ical-check-version
branch
from
596c36a
to
71f736a
Compare
dbnicholson
changed the title
gnomesysadmins
pushed a commit
to GNOME/evolution-data-server
that referenced
this pull request
Mar 27, 2018
Apparently multithreaded uses of icaltimezone has been fixed in 3.0.1[1] and 3.0.2[2]. Don't preload the timezones in that case as they take up an enormous amount of heap. Unfortunately, the ICAL_CHECK_VERSION macro needed to check the version has been broken until recently[3]. Redefine it locally until the libical build requirement is new enough to contain the fixed macro in ical.h. 1. https://github.com/libical/libical/releases/tag/v3.0.1 2. https://github.com/libical/libical/releases/tag/v3.0.2 3. libical/libical#335
gnomesysadmins
pushed a commit
to GNOME/evolution-data-server
that referenced
this pull request
Mar 27, 2018
Apparently multithreaded uses of icaltimezone has been fixed in 3.0.1[1] and 3.0.2[2]. Don't preload the timezones in that case as they take up an enormous amount of heap. Unfortunately, the ICAL_CHECK_VERSION macro needed to check the version has been broken until recently[3]. Redefine it locally until the libical build requirement is new enough to contain the fixed macro in ical.h. 1. https://github.com/libical/libical/releases/tag/v3.0.1 2. https://github.com/libical/libical/releases/tag/v3.0.2 3. libical/libical#335
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The inclusion of the icalversion.h header in ical.h breaks the
ICAL_CHECK_VERSION macro because all the \ line continuation characters
are converted to ;. This makes the macro useless. Wrapping for the sake
of readability, it currently looks like this:
#define ICAL_CHECK_VERSION(major,minor,micro) ; (ICAL_MAJOR_VERSION >
(major) || ; (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION >
(minor)) || ; (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION ==
(minor) && ; ICAL_MICRO_VERSION >= (micro)))
Setting the STRINGS NEWLINE_CONSUME option keeps the original structure
instead of terminating the lines.