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