pidgin: 10a19d0d: Fixed some warnings when compiling Gadu-...

tomkiewicz at cpw.pidgin.im tomkiewicz at cpw.pidgin.im
Sat Jun 18 07:49:24 EDT 2011


----------------------------------------------------------------------
Revision: 10a19d0da323fdc8c2b315968e383219d8b9101f
Parent:   a5416dfeb373488f101a2c427d05130ed6824203
Author:   tomkiewicz at cpw.pidgin.im
Date:     06/18/11 07:44:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/10a19d0da323fdc8c2b315968e383219d8b9101f

Changelog: 

Fixed some warnings when compiling Gadu-Gadu prpl under Windows.

Changes against parent a5416dfeb373488f101a2c427d05130ed6824203

  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/resolver.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/lib/libgadu.h	f12d62503336c6615daee9fb9987877bcce046bc
+++ libpurple/protocols/gg/lib/libgadu.h	3a16d1d0be02034a431087507866d7df145a5f83
@@ -1442,6 +1442,7 @@ int gg_file_hash_sha1(int fd, uint8_t *r
 
 int gg_file_hash_sha1(int fd, uint8_t *result) GG_DEPRECATED;
 
+#undef printf
 #ifdef __GNUC__
 char *gg_saprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2))) GG_DEPRECATED;
 #else
============================================================
--- libpurple/protocols/gg/lib/resolver.c	65df2bfb80d2e7b4790a26a85111907b3a4aa846
+++ libpurple/protocols/gg/lib/resolver.c	de746848ad54b347d8c2997e9e6486c478fa9105
@@ -249,6 +249,7 @@ int gg_gethostbyname_real(const char *ho
 #endif /* GG_CONFIG_HAVE_GETHOSTBYNAME_R */
 }
 
+#if defined(GG_CONFIG_HAVE_PTHREAD) || !defined(_WIN32)
 /**
  * \internal Rozwi?zuje nazw? i zapisuje wynik do podanego desktyptora.
  *
@@ -286,6 +287,7 @@ static int gg_resolver_run(int fd, const
 
 	return res;
 }
+#endif
 
 /**
  * \internal Odpowiednik \c gethostbyname zapewniaj?cy wsp??bie?no??.


More information about the Commits mailing list