]> git.notmuchmail.org Git - notmuch/commit - lib/notmuch-private.h
fix build failure with glib 2.67
authorDavid Bremner <david@tethera.net>
Mon, 15 Feb 2021 20:43:50 +0000 (16:43 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 15 Feb 2021 20:43:50 +0000 (16:43 -0400)
commit6db8b422d91a75b7c16f013f10f41d1109ce5866
tree7bbbd41d9846126b3e6e18de6baefa7fe0e95737
parent1692fe7aa8b137d02817bb11f248d204d6ab4048
fix build failure with glib 2.67

Based on a patch from Michael J Gruber [1].  As of glib 2.67 (more
specifically [2]), including "gmime-extra.h" inside an extern "C"
block causes build failures, because glib is using C++ features.

Observing that "gmime-extra.h" is no longer needed in
notmuch-private.h, which can simply delete that include, but
we have to correspondingly move the includes which might include
it (in particular crypto.h) out of the extern "C" block also.

This seems less fragile than only moving gmime-extra, and relying on
preprocessor sentinels to keep the deeper includes from happening.

Move to the include to the outside of the extern block.

[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu
[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
lib/notmuch-private.h