diff options
| author | David Bremner <david@tethera.net> | 2017-07-17 09:20:10 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-07-17 09:20:10 -0300 |
| commit | 4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051 (patch) | |
| tree | 388352a656b8cc81e714ab1f678a4fc9d21389b5 | |
| parent | 470f74d4018f1c98d905b07d493eb2698c576181 (diff) | |
| parent | 3891036eee15fc2c6a18c04da3d321f2f7645c31 (diff) | |
Merge tag 'debian/0.25_rc0-2'
merge 32 bit compilation fix
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | util/gmime-extra.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f02f2132..c74e53c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.25~rc0-2) experimental; urgency=medium + + * Fix compilation on 32 bit architectures (time_t vs. gint64) + + -- David Bremner <bremner@debian.org> Mon, 17 Jul 2017 08:49:32 -0300 + notmuch (0.25~rc0-1) experimental; urgency=medium * New upstream release candidate diff --git a/util/gmime-extra.c b/util/gmime-extra.c index ed53e0ab..901d4d56 100644 --- a/util/gmime-extra.c +++ b/util/gmime-extra.c @@ -100,9 +100,9 @@ g_mime_signature_status_error (GMimeSignatureError error) { return (error != GMIME_SIGNATURE_ERROR_NONE); } -time_t +gint64 g_mime_utils_header_decode_date_unix (const char *date) { - return g_mime_utils_header_decode_date (date, NULL); + return (gint64) g_mime_utils_header_decode_date (date, NULL); } #else /* GMime >= 3.0 */ |