Merge "libc: remove private declarations from <time.h> and <resolv.h>"
diff --git a/libc/include/resolv.h b/libc/include/resolv.h
index 5463ce6..7c34012 100644
--- a/libc/include/resolv.h
+++ b/libc/include/resolv.h
@@ -50,33 +50,6 @@
extern int b64_ntop(u_char const *, size_t, char *, size_t);
extern int b64_pton(char const *, u_char *, size_t);
-
-/* The following declarations should *not* be part of the public C library
- * headers, and are also in bionic/libc/private/resolv_iface.h
- *
- * Use a guard macro to prevent duplication until we modify system/netd
- * to use the proper header.
- */
-#ifndef _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED
-#define _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED
-
-/* Set name of default interface */
-extern void _resolv_set_default_iface(const char* ifname);
-
-/* set name servers for an interface */
-extern void _resolv_set_nameservers_for_iface(const char* ifname, char** servers, int numservers);
-
-/* tell resolver of the address of an interface */
-extern void _resolv_set_addr_of_iface(const char* ifname, struct in_addr* addr);
-
-/* flush the cache associated with the default interface */
-extern void _resolv_flush_cache_for_default_iface();
-
-/* flush the cache associated with a certain interface */
-extern void _resolv_flush_cache_for_iface(const char* ifname);
-
-#endif /* _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED */
-
__END_DECLS
#endif /* _RESOLV_H_ */
diff --git a/libc/include/time.h b/libc/include/time.h
index 011d161..8867b32 100644
--- a/libc/include/time.h
+++ b/libc/include/time.h
@@ -79,35 +79,6 @@
extern char* strptime(const char *buf, const char *fmt, struct tm *tm);
extern size_t strftime(char *s, size_t max, const char *format, const struct tm *tm);
-/* The following declarations should not be part of the C library's public
- * headers. They are duplicated under bionic/libc/private/bionic_time.h and
- * will be removed from here when we modify system/libcutils to use the
- * proper header instead.
- *
- * Use a guard macro to avoid compilation error when both headers are
- * included.
- */
-#ifndef _BIONIC_STRFTIME_TZ_DECLARED
-#define _BIONIC_STRFTIME_TZ_DECLARED
-
-struct strftime_locale {
- const char * mon[12];
- const char * month[12];
- const char * standalone_month[12];
- const char * wday[7];
- const char * weekday[7];
- const char * X_fmt;
- const char * x_fmt;
- const char * c_fmt;
- const char * am;
- const char * pm;
- const char * date_fmt;
-};
-
-extern size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale* lc);
-
-#endif /* _BIONIC_STRFTIME_TZ_DECLARED */
-
extern char *ctime(const time_t *timep);
extern char *ctime_r(const time_t *timep, char *buf);
diff --git a/libc/netbsd/resolv/res_cache.c b/libc/netbsd/resolv/res_cache.c
index e88c221..24edbb6 100644
--- a/libc/netbsd/resolv/res_cache.c
+++ b/libc/netbsd/resolv/res_cache.c
@@ -42,6 +42,7 @@
#include <arpa/inet.h>
#include "resolv_private.h"
+#include "resolv_iface.h"
/* This code implements a small and *simple* DNS resolver cache.
*
diff --git a/libc/tzcode/strftime.c b/libc/tzcode/strftime.c
index a2cc3b3..f6e7435 100644
--- a/libc/tzcode/strftime.c
+++ b/libc/tzcode/strftime.c
@@ -38,6 +38,7 @@
#include "locale.h"
#include <ctype.h>
#include <time64.h>
+#include <bionic_time.h> /* for strftime_tz */
/* struct lc_time_T is now defined as strftime_locale
* in <time.h>