/pidgin/main: ecf3b04c3cc2: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: ecf3b04c3cc21d455c12700c9960a0816b128285
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-03 19:12 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/ecf3b04c3cc2

Description:

Merge release-2.x.y

diffstat:

 libpurple/protocols/gg/lib/internal.h |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff --git a/libpurple/protocols/gg/lib/internal.h b/libpurple/protocols/gg/lib/internal.h
--- a/libpurple/protocols/gg/lib/internal.h
+++ b/libpurple/protocols/gg/lib/internal.h
@@ -29,6 +29,9 @@
 #ifdef _WIN32
 #  define GG_SIZE_FMT "Iu"
 #  define _GG_INT64_MODIFIER "I64"
+#elif defined(_LP64)
+#  define GG_SIZE_FMT "zu"
+#  define _GG_INT64_MODIFIER "l"
 #else
 #  define GG_SIZE_FMT "zu"
 #  define _GG_INT64_MODIFIER "ll"