am a289964b: am 227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"

* commit 'a289964bca39c591b54e0c336da1a6730e85cd61':
  resolv_private.h: remove #define b64_ntop and b64_pton
This commit is contained in:
Nick Kralevich 2013-06-28 13:37:08 -07:00 committed by Android Git Automerger
commit 22570f51a5

View File

@ -345,11 +345,6 @@ extern const struct res_sym __p_type_syms[];
extern const struct res_sym __p_rcode_syms[];
#endif /* SHARED_LIBBIND */
#ifndef ADNROID_CHANGES
#define b64_ntop __b64_ntop
#define b64_pton __b64_pton
#endif
#define dn_comp __dn_comp
#define dn_count_labels __dn_count_labels
#define dn_skipname __dn_skipname