From 51e6cfa32ba93cac4c7a155c71756f631e7761ab Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 29 May 2008 05:46:17 +0000 Subject: [PATCH] 2008-05-29 [colin] 3.4.0cvs72 * src/common/utils.h Workaround a stupid Glib issue, where goffset happens to be undefined. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/utils.h | 7 +++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d2061e816..4d6e78bea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-29 [colin] 3.4.0cvs72 + + * src/common/utils.h + Workaround a stupid Glib issue, where + goffset happens to be undefined. + 2008-05-28 [colin] 3.4.0cvs71 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index ef484f177..a42310e83 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3367,3 +3367,4 @@ ( cvs diff -u -r 1.83.2.131 -r 1.83.2.132 src/mimeview.c; ) > 3.4.0cvs69.patchset ( cvs diff -u -r 1.274.2.244 -r 1.274.2.245 src/mainwindow.c; cvs diff -u -r 1.39.2.45 -r 1.39.2.46 src/mainwindow.h; cvs diff -u -r 1.14.2.62 -r 1.14.2.63 src/plugins/trayicon/trayicon.c; ) > 3.4.0cvs70.patchset ( cvs diff -u -r 1.382.2.450 -r 1.382.2.451 src/compose.c; cvs diff -u -r 1.50.2.45 -r 1.50.2.46 src/compose.h; cvs diff -u -r 1.14.2.19 -r 1.14.2.20 src/grouplistdialog.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/image_viewer.c; cvs diff -u -r 1.179.2.222 -r 1.179.2.223 src/imap.c; cvs diff -u -r 1.149.2.90 -r 1.149.2.91 src/inc.c; cvs diff -u -r 1.115.2.195 -r 1.115.2.196 src/main.c; cvs diff -u -r 1.75.2.59 -r 1.75.2.60 src/matcher.c; cvs diff -u -r 1.94.2.177 -r 1.94.2.178 src/messageview.c; cvs diff -u -r 1.83.2.132 -r 1.83.2.133 src/mimeview.c; cvs diff -u -r 1.3.2.56 -r 1.3.2.57 src/prefs_themes.c; cvs diff -u -r 1.60.2.52 -r 1.60.2.53 src/procmsg.h; cvs diff -u -r 1.395.2.369 -r 1.395.2.370 src/summaryview.c; cvs diff -u -r 1.68.2.46 -r 1.68.2.47 src/summaryview.h; cvs diff -u -r 1.96.2.201 -r 1.96.2.202 src/textview.c; cvs diff -u -r 1.11.2.23 -r 1.11.2.24 src/common/smtp.c; cvs diff -u -r 1.36.2.141 -r 1.36.2.142 src/common/utils.c; cvs diff -u -r 1.20.2.62 -r 1.20.2.63 src/common/utils.h; ) > 3.4.0cvs71.patchset +( cvs diff -u -r 1.20.2.63 -r 1.20.2.64 src/common/utils.h; ) > 3.4.0cvs72.patchset diff --git a/configure.ac b/configure.ac index a460bf0e1..b2bafad8d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=71 +EXTRA_VERSION=72 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/utils.h b/src/common/utils.h index 7195c70bb..fcb7cc3a6 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -71,6 +71,13 @@ gint g_chmod (const gchar *path, #endif /* !GLIB_CHECK_VERSION */ +/* why is this sometimes undefined !? */ +#ifndef G_MAXOFFSET +typedef gint64 goffset; +#define G_MINOFFSET G_MININT64 +#define G_MAXOFFSET G_MAXINT64 +#endif + #ifndef HAVE_U32_TYPEDEF #undef u32 /* maybe there is a macro with this name */ typedef guint32 u32; -- 2.25.1