diff options
author | Gary Kramlich <grim@reaperworld.com> | 2018-01-04 22:50:06 -0600 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2018-01-04 22:50:06 -0600 |
commit | 12e74c6de7ee60d6abafc6526a315e214ef7df36 (patch) | |
tree | c375595f5d7e7006fddd4b34a430d61bb6b086bb | |
parent | acee7299d4b7ba327dae5b4380225509e59b0770 (diff) | |
download | pidgin-12e74c6de7ee60d6abafc6526a315e214ef7df36.tar.gz |
remove all #if 0's from libpurple/win32
-rw-r--r-- | libpurple/win32/libc_interface.c | 23 | ||||
-rw-r--r-- | libpurple/win32/libc_internal.h | 24 |
2 files changed, 0 insertions, 47 deletions
diff --git a/libpurple/win32/libc_interface.c b/libpurple/win32/libc_interface.c index 7eb5b9ee93..2c10fb91f8 100644 --- a/libpurple/win32/libc_interface.c +++ b/libpurple/win32/libc_interface.c @@ -409,13 +409,6 @@ int wpurple_read(int fd, void *buf, unsigned int size) { 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 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) { 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 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) } 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 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) { 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 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) } 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); diff --git a/libpurple/win32/libc_internal.h b/libpurple/win32/libc_internal.h index 10fa2483e8..f68749c94c 100644 --- a/libpurple/win32/libc_internal.h +++ b/libpurple/win32/libc_internal.h @@ -77,36 +77,12 @@ struct ifreq 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 { |