pidgin/pidgin

Merged in rw_grim/pidgin (pull request #307)

2018-01-06, Gary Kramlich
729ef4fec9b0
Parents 2c1acd998186e80473941281
Children 4742f7be311179e613af04c4
Merged in rw_grim/pidgin (pull request #307)

remove all #if 0's from libpurple/win32

Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb
2 files changed, 0 insertions(+), 47 deletions(-)
  • +0 -23
    libpurple/win32/libc_interface.c
  • +0 -24
    libpurple/win32/libc_internal.h
    • --- a/libpurple/win32/libc_interface.c Thu Dec 28 23:49:01 2017 -0600
    +++ b/libpurple/win32/libc_interface.c Sat Jan 06 03:01:07 2018 +0000
    @@ -409,13 +409,6 @@
    errno = EAGAIN;
    return -1;
    }
    -#if 0
    - else if( ret == 0 ) {
    - /* connection has been gracefully closed */
    - errno = WSAENOTCONN;
    - return -1;
    - }
    -#endif
    else {
    /* success reading socket */
    return ret;
    @@ -933,10 +926,6 @@
    {
    if (purple_strequal(tzname, win32_tzmap[i].wstd))
    {
    -#if 0
    - purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n",
    - win32_tzmap[i].ustd, tzname);
    -#endif
    /* Cache the Result */
    if (i > 0) {
    if (win32_tzmap[0].wstd[0] != '\0')
    @@ -949,10 +938,6 @@
    }
    if (purple_strequal(tzname, win32_tzmap[i].wdst))
    {
    -#if 0
    - purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n",
    - win32_tzmap[i].udst, tzname);
    -#endif
    /* Cache the Result */
    if (i > 0) {
    if (win32_tzmap[0].wdst[0] != '\0')
    @@ -1056,10 +1041,6 @@
    {
    if (purple_strequal(localtzname, win32_tzmap[i].wstd))
    {
    -#if 0
    - purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n",
    - win32_tzmap[i].ustd, tzname, localtzname);
    -#endif
    /* Cache the Result */
    if (win32_tzmap[0].wstd[0] != '\0')
    g_free(win32_tzmap[0].wstd);
    @@ -1070,10 +1051,6 @@
    }
    if (purple_strequal(localtzname, win32_tzmap[i].wdst))
    {
    -#if 0
    - purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n",
    - win32_tzmap[i].udst, tzname, localtzname);
    -#endif
    /* Cache the Result */
    if (win32_tzmap[0].wdst[0] != '\0')
    g_free(win32_tzmap[0].wdst);
    --- a/libpurple/win32/libc_internal.h Thu Dec 28 23:49:01 2017 -0600
    +++ b/libpurple/win32/libc_internal.h Sat Jan 06 03:01:07 2018 +0000
    @@ -77,36 +77,12 @@
    union
    {
    struct sockaddr ifru_addr;
    -#if 0
    - struct sockaddr ifru_dstaddr;
    - struct sockaddr ifru_broadaddr;
    - struct sockaddr ifru_netmask;
    - struct sockaddr ifru_hwaddr;
    - short int ifru_flags;
    - int ifru_ivalue;
    - int ifru_mtu;
    -#endif
    char *ifru_data;
    } ifr_ifru;
    };
    # define ifr_name ifr_ifrn.ifrn_name /* interface name */
    # define ifr_addr ifr_ifru.ifru_addr /* address */
    -#if 0
    -# define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
    -# define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */
    -# define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
    -# define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */
    -# define ifr_flags ifr_ifru.ifru_flags /* flags */
    -# define ifr_metric ifr_ifru.ifru_ivalue /* metric */
    -# define ifr_mtu ifr_ifru.ifru_mtu /* mtu */
    -#endif
    # define ifr_data ifr_ifru.ifru_data /* for use by interface */
    -#if 0
    -# define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */
    -# define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */
    -# define ifr_qlen ifr_ifru.ifru_ivalue /* queue length */
    -#endif
    -
    struct ifconf
    {