pidgin/android/libpurple

Fixing warnings (win32, glib, others)

2013-04-14, Tomasz Wasilczyk
3fd1628aa718
Parents 8a0d96bd9cf4
Children 4031059e4bd6
Fixing warnings (win32, glib, others)
6 files changed, 15 insertions(+), 8 deletions(-)
  • +7 -1
    libpurple/glibcompat.h
  • +3 -2
    libpurple/ntlm.c
  • +1 -2
    libpurple/proxy.c
  • +1 -1
    libpurple/util.c
  • +2 -2
    libpurple/win32/libc_interface.c
  • +1 -0
    libpurple/win32/win32dep.c
    • --- a/libpurple/glibcompat.h Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/glibcompat.h Sun Apr 14 16:43:22 2013 +0200
    @@ -25,12 +25,18 @@
    * Also, any public API should not depend on this file.
    */
    +#if GLIB_CHECK_VERSION(2, 32, 0)
    +
    +#define g_thread_init(vtable) {}
    +
    #if GLIB_CHECK_VERSION(2, 36, 0)
    -#define g_type_init()
    +#define g_type_init() {}
    #endif /* >= 2.36.0 */
    +#endif /* >= 2.32.0 */
    +
    #if !GLIB_CHECK_VERSION(2, 32, 0)
    --- a/libpurple/ntlm.c Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/ntlm.c Sun Apr 14 16:43:22 2013 +0200
    @@ -243,8 +243,9 @@
    red = 0;
    } else if (red < 16) {
    purple_debug_warning("ntlm", "Tried reading 16 bytes from "
    - "/dev/urandom but only got %zd. Falling back to "
    - "inferior method\n", red);
    + "/dev/urandom but only got %"
    + G_GSSIZE_FORMAT ". Falling back to "
    + "inferior method\n", (gssize)red);
    }
    } else {
    purple_debug_warning("ntlm", "Error opening /dev/urandom: %s."
    --- a/libpurple/proxy.c Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/proxy.c Sun Apr 14 16:43:22 2013 +0200
    @@ -979,9 +979,8 @@
    major = strtol(p, &p, 10);
    error = (major == 0) || (*p != '.');
    if(!error) {
    - int minor;
    p++;
    - minor = strtol(p, &p, 10);
    + /* minor = strtol(p, &p, 10); */
    error = (*p != ' ');
    if(!error) {
    p++;
    --- a/libpurple/util.c Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/util.c Sun Apr 14 16:43:22 2013 +0200
    @@ -3354,7 +3354,7 @@
    case AF_INET6:
    {
    int val = 0;
    - guint len = sizeof(val);
    + socklen_t len = sizeof(val);
    if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
    return FALSE;
    --- a/libpurple/win32/libc_interface.c Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/win32/libc_interface.c Sun Apr 14 16:43:22 2013 +0200
    @@ -308,7 +308,7 @@
    struct sockaddr_in6 sin6;
    struct sockaddr_in sin;
    } sa;
    - size_t srcsize;
    + int srcsize;
    switch(af)
    {
    @@ -325,7 +325,7 @@
    return -1;
    }
    - if (WSAStringToAddress(src, af, NULL, (struct sockaddr *) &sa, &srcsize) != 0)
    + if (WSAStringToAddress((LPTSTR)src, af, NULL, (struct sockaddr *) &sa, &srcsize) != 0)
    {
    errno = WSAGetLastError();
    return -1;
    --- a/libpurple/win32/win32dep.c Sun Apr 14 15:23:08 2013 +0200
    +++ b/libpurple/win32/win32dep.c Sun Apr 14 16:43:22 2013 +0200
    @@ -27,6 +27,7 @@
    #include <winuser.h>
    #include "debug.h"
    +#include "glibcompat.h"
    #include "notify.h"
    /*