diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-30 23:16:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-30 23:16:01 +0000 |
| commit | dd9efcbab631a823d67c71a36e17c15ebd8fe502 (patch) | |
| tree | 7b445feb2ce341520e9257516323e1c766a6d609 /libc/dns/net | |
| parent | 27cc284e02814cf45a25798c018eea77fd18b85c (diff) | |
| parent | c5f1504e3db3a39bb951bf01e2d0d758ca93cc44 (diff) | |
| download | bionic-dd9efcbab631a823d67c71a36e17c15ebd8fe502.zip bionic-dd9efcbab631a823d67c71a36e17c15ebd8fe502.tar.gz bionic-dd9efcbab631a823d67c71a36e17c15ebd8fe502.tar.bz2 | |
am c5f1504e: am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."
* commit 'c5f1504e3db3a39bb951bf01e2d0d758ca93cc44':
Restore <nsswitch.h> which is BSD API, not private.
Diffstat (limited to 'libc/dns/net')
| -rw-r--r-- | libc/dns/net/nsdispatch.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libc/dns/net/nsdispatch.c b/libc/dns/net/nsdispatch.c index 15282be..fb6d8f6 100644 --- a/libc/dns/net/nsdispatch.c +++ b/libc/dns/net/nsdispatch.c @@ -69,26 +69,14 @@ */ #include <sys/cdefs.h> -#include <sys/types.h> -#include <sys/param.h> -#include <sys/stat.h> #include <assert.h> -#ifdef __ELF__ -#include <dlfcn.h> -#endif /* __ELF__ */ -#include <fcntl.h> -#define _NS_PRIVATE #include <nsswitch.h> #include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <strings.h> -#include <unistd.h> static nss_method -_nsmethod(const char *source, const char *database, const char *method, +_nsmethod(const char *source, const char *database __unused, const char *method __unused, const ns_dtab disp_tab[], void **cb_data) { int curdisp; |