commit a289964bca39c591b54e0c336da1a6730e85cd61
author Nick Kralevich <nnk@google.com> Fri Jun 28 13:32:43 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 28 13:32:43 2013 -0700
tree 72ba921c1374dc268c987f52913d8af9fd0febcb
parent 2018cfa85d4c7f36316376f5b090be5f0d3d13dc
parent 227b47a461b27d746b373feb66001cdddc9ba1db

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

* commit '227b47a461b27d746b373feb66001cdddc9ba1db':
  resolv_private.h: remove #define b64_ntop and b64_pton

libc/private/resolv_private.h

diff --git a/libc/private/resolv_private.h b/libc/private/resolv_private.h
index 0e799ca..a7a461d 100644
--- a/libc/private/resolv_private.h
+++ b/libc/private/resolv_private.h
@@ -345,11 +345,6 @@
 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