Browse Source
* krb5: res_init and res_search prototypes are now declared * mariadb: snprintf is no longer a macro * mariadb: enable arm, i686android-5
Vishal Biswas
8 years ago
committed by
Fredrik Fornwall
3 changed files with 0 additions and 38 deletions
@ -1,15 +0,0 @@ |
|||||
--- ./lib/krb5/os/dnsglue.h 2016-12-02 04:01:25.000000000 +0530
|
|
||||
+++ ../dnsglue.h 2016-12-06 23:46:48.394430806 +0530
|
|
||||
@@ -150,6 +150,12 @@
|
|
||||
(ptr) += (incr); \ |
|
||||
} while (0) |
|
||||
|
|
||||
+/* Bionic has res_init() but it's not in any header */
|
|
||||
+#ifdef __BIONIC__
|
|
||||
+extern int res_init (void);
|
|
||||
+extern int res_search (const char *dname, int class, int type,unsigned char *answer, int anslen);
|
|
||||
+#endif
|
|
||||
+
|
|
||||
struct krb5int_dns_state; |
|
||||
|
|
||||
int krb5int_dns_init(struct krb5int_dns_state **, char *, int, int); |
|
@ -1,14 +0,0 @@ |
|||||
bionic snprintf is defined as a macro, so this saves chaos |
|
||||
--- ./include/m_ctype.h 2017-01-18 01:08:20.000000000 +0530
|
|
||||
+++ ../m_ctype.h 2017-02-01 09:14:37.958658913 +0530
|
|
||||
@@ -398,7 +398,9 @@
|
|
||||
const char *m_cannot_convert_error_pos; |
|
||||
} MY_STRCONV_STATUS; |
|
||||
|
|
||||
-
|
|
||||
+#ifdef __ANDROID__
|
|
||||
+#undef snprintf
|
|
||||
+#endif
|
|
||||
/* See strings/CHARSET_INFO.txt about information on this structure */ |
|
||||
struct my_charset_handler_st |
|
||||
{ |
|
Loading…
Reference in new issue