diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-02 16:02:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-02 16:02:30 -0700 |
| commit | 833dc584d4d02ab8e396b877b38a8a5ad8ba4882 (patch) | |
| tree | 90022e1b93736e428cc34be113d7a944dd8ac049 | |
| parent | 7c808b29d5cea61e5bda90a1b0f2f0e669ee135e (diff) | |
| parent | 87b4286f092094a2e8069a06e20ef5036a258172 (diff) | |
| download | bionic-833dc584d4d02ab8e396b877b38a8a5ad8ba4882.zip bionic-833dc584d4d02ab8e396b877b38a8a5ad8ba4882.tar.gz bionic-833dc584d4d02ab8e396b877b38a8a5ad8ba4882.tar.bz2 | |
am 87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
* commit '87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
| -rw-r--r-- | libc/include/resolv.h | 14 | ||||
| -rw-r--r-- | libc/private/resolv_private.h | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libc/include/resolv.h b/libc/include/resolv.h index 7c34012..36b93ee 100644 --- a/libc/include/resolv.h +++ b/libc/include/resolv.h @@ -43,12 +43,14 @@ struct res_state; extern struct __res_state *__res_state(void); #define _res (*__res_state()) -/* Base-64 functions - because some code expects it there */ - -#define b64_ntop __b64_ntop -#define b64_pton __b64_pton -extern int b64_ntop(u_char const *, size_t, char *, size_t); -extern int b64_pton(char const *, u_char *, size_t); +#define b64_ntop __b64_ntop +#define b64_pton __b64_pton +extern int b64_ntop(u_char const*, size_t, char*, size_t); +extern int b64_pton(char const*, u_char*, size_t); + +#define dn_comp __dn_comp +extern int dn_comp(const char*, u_char*, int, u_char**, u_char**); +extern int dn_expand(const u_char*, const u_char*, const u_char*, char*, int); __END_DECLS diff --git a/libc/private/resolv_private.h b/libc/private/resolv_private.h index a7a461d..9648a8f 100644 --- a/libc/private/resolv_private.h +++ b/libc/private/resolv_private.h @@ -345,7 +345,9 @@ extern const struct res_sym __p_type_syms[]; extern const struct res_sym __p_rcode_syms[]; #endif /* SHARED_LIBBIND */ +#ifndef ANDROID_CHANGES #define dn_comp __dn_comp +#endif #define dn_count_labels __dn_count_labels #define dn_skipname __dn_skipname #define fp_resstat __fp_resstat @@ -440,9 +442,6 @@ const u_char * p_fqname(const u_char *, const u_char *, FILE *); const char * p_option(u_long); char * p_secstodate(u_long); int dn_count_labels(const char *); -int dn_comp(const char *, u_char *, int, u_char **, u_char **); -int dn_expand(const u_char *, const u_char *, const u_char *, - char *, int); u_int res_randomid(void); int res_nameinquery(const char *, int, int, const u_char *, const u_char *); |