Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../pidgin-2.10.9/libpurple/dnssrv.c ./libpurple/dnssrv.c |
2 | --- ../pidgin-2.10.9/libpurple/dnssrv.c 2014-02-02 22:29:17.000000000 +0100 | |
3 | +++ ./libpurple/dnssrv.c 2014-03-06 22:16:22.000000000 +0100 | |
4 | @@ -54,6 +54,17 @@ | |
5 | #include "eventloop.h" | |
6 | #include "network.h" | |
7 | ||
8 | +#ifdef __ANDROID__ | |
9 | +#include <stdint.h> | |
10 | +#define GETSHORT(s, cp) do { \ | |
11 | + register const u_char *t_cp = (const u_char *)(cp); \ | |
12 | + (s) = ((uint16_t)t_cp[0] << 8) \ | |
13 | + | ((uint16_t)t_cp[1]) \ | |
14 | + ; \ | |
15 | + (cp) += sizeof(uint16_t); \ | |
16 | +} while (0) | |
17 | +#endif | |
18 | + | |
19 | static PurpleSrvTxtQueryUiOps *srv_txt_query_ui_ops = NULL; | |
20 | ||
21 | #ifndef _WIN32 | |
22 | @@ -485,7 +496,9 @@ | |
23 | if (size == -1) { | |
24 | purple_debug_warning("dnssrv", "res_query returned an error\n"); | |
25 | /* Re-read resolv.conf and friends in case DNS servers have changed */ | |
26 | +#ifndef __ANDROID__ | |
27 | res_init(); | |
28 | +#endif | |
29 | } else | |
30 | purple_debug_info("dnssrv", "Found 0 entries, errno is %i\n", errno); | |
31 |