/pidgin/main: f4232b1c3263: Update libgadu yet again

Tomasz Wasilczyk twasilczyk at pidgin.im
Mon Mar 24 14:56:53 EDT 2014


Changeset: f4232b1c32632b858ee513d8f90a16643e166601
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-24 19:56 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/f4232b1c3263

Description:

Update libgadu yet again

diffstat:

 libpurple/protocols/gg/lib/internal.h   |  3 ++-
 libpurple/protocols/gg/lib/protobuf-c.c |  4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (41 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
@@ -57,7 +57,8 @@
 
 #define GG_STATIC_ASSERT(condition, message) \
 	{ typedef char static_assertion_failed_ ## message \
-	[(condition) ? 1 : -1]; }
+	[(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \
+	(void)dummy; }
 
 struct gg_dcc7_relay {
 	uint32_t addr;
diff --git a/libpurple/protocols/gg/lib/protobuf-c.c b/libpurple/protocols/gg/lib/protobuf-c.c
--- a/libpurple/protocols/gg/lib/protobuf-c.c
+++ b/libpurple/protocols/gg/lib/protobuf-c.c
@@ -1363,9 +1363,11 @@ pack_buffer_packed_payload (const Protob
     }
   return rv;
 
+#if IS_LITTLE_ENDIAN
 no_packing_needed:
   buffer->append (buffer, rv, array);
   return rv;
+#endif
 }
 
 static size_t
@@ -2027,10 +2029,12 @@ parse_packed_repeated_member (ScannedMem
   *p_n += count;
   return TRUE;
 
+#if IS_LITTLE_ENDIAN
 no_unpacking_needed:
   memcpy (array, at, count * siz);
   *p_n += count;
   return TRUE;
+#endif
 }
 
 static protobuf_c_boolean



More information about the Commits mailing list