/pidgin/main: 1fec9235461d: Merge... my shame...

[Tomasz Wasilczyk]

Changeset: 1fec9235461d895ae1c4a01e4a7d15d5e15fc054
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-28 17:29 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/1fec9235461d

Description:

Merge... my shame...

diffstat:

 libpurple/plugins/perl/Makefile.mingw        |  3 +++
 libpurple/plugins/perl/common/Makefile.mingw |  3 +++
 libpurple/protocols/mxit/markup.c            |  2 +-
 pidgin/plugins/perl/common/Makefile.mingw    |  3 +++
 4 files changed, 10 insertions(+), 1 deletions(-)

diffs (51 lines):

diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = perl
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
 
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -213,7 +213,7 @@ static int asn_getUtf8( const gchar* dat
 		return -1;
 	}
 
-	len = (uint8_t)data[1]; /* length field [1 byte] */
+	len = (guint8)data[1]; /* length field [1 byte] */
 	out_str = g_malloc(len + 1);
 	memcpy(out_str, &data[2], len); /* data field */
 	out_str[len] = '\0';
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
 
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))