Mercurial > pidgin
changeset 31528:92f3d821653f
purple: Fix some compiler warnings related to new API and missing prototypes.
Really just an excuse to cause everyone to need to rebuild everything.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 03 May 2011 05:19:14 +0000 |
| parents | c832d481d021 |
| children | 79ae7200a11a |
| files | libpurple/dnsquery.c libpurple/dnsquery.h libpurple/dnssrv.c libpurple/dnssrv.h libpurple/proxy.c libpurple/proxy.h |
| diffstat | 6 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/dnsquery.c Tue May 03 05:19:14 2011 +0000 @@ -24,6 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ +#define _PURPLE_DNSQUERY_C_ #include "internal.h" #include "debug.h"
--- a/libpurple/dnsquery.h Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/dnsquery.h Tue May 03 05:19:14 2011 +0000 @@ -102,7 +102,7 @@ */ PurpleDnsQueryData *purple_dnsquery_a_account(PurpleAccount *account, const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSQUERY_C_) /** * Perform an asynchronous DNS query. *
--- a/libpurple/dnssrv.c Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/dnssrv.c Tue May 03 05:19:14 2011 +0000 @@ -20,6 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ +#define _PURPLE_DNSSRV_C_ #include "internal.h" #include "util.h"
--- a/libpurple/dnssrv.h Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/dnssrv.h Tue May 03 05:19:14 2011 +0000 @@ -114,7 +114,7 @@ */ PurpleSrvTxtQueryData *purple_srv_resolve_account(PurpleAccount *account, const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_) /** * Queries an SRV record. * @@ -149,7 +149,7 @@ */ PurpleSrvTxtQueryData *purple_txt_resolve_account(PurpleAccount *account, const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_) /** * Queries an TXT record. *
--- a/libpurple/proxy.c Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/proxy.c Tue May 03 05:19:14 2011 +0000 @@ -29,6 +29,7 @@ /* it is intended to : 1st handle http proxy, using the CONNECT command , 2nd provide an easy way to add socks support , 3rd draw women to it like flies to honey */ +#define _PURPLE_PROXY_C_ #include "internal.h" #include "cipher.h"
--- a/libpurple/proxy.h Tue May 03 05:03:41 2011 +0000 +++ b/libpurple/proxy.h Tue May 03 05:19:14 2011 +0000 @@ -312,7 +312,7 @@ const char *host, int port, PurpleProxyConnectFunction connect_cb, gpointer data); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PROXY_C_) /** * Makes a connection through a SOCKS5 proxy. *