diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-06-02 15:31:01 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-06-02 15:31:01 -0700 |
commit | b127b1f208e67d74a7ee94ad2bd0ffb2fed3af6b (patch) | |
tree | 9fd2025567af61dc64c2b23c9da6827f933bff46 /libc | |
parent | e1bd6aa4e10e6b05e74d915c52e11a3998217522 (diff) | |
parent | 8a5123740750298433cce102f93cf5871985aa09 (diff) | |
download | android_bionic-b127b1f208e67d74a7ee94ad2bd0ffb2fed3af6b.tar.gz android_bionic-b127b1f208e67d74a7ee94ad2bd0ffb2fed3af6b.tar.bz2 android_bionic-b127b1f208e67d74a7ee94ad2bd0ffb2fed3af6b.zip |
Merge "libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto."
Diffstat (limited to 'libc')
-rw-r--r-- | libc/include/netdb.h | 4 | ||||
-rw-r--r-- | libc/include/netinet/ip.h | 2 | ||||
-rw-r--r-- | libc/netbsd/gethnamaddr.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libc/include/netdb.h b/libc/include/netdb.h index c2e08ea87..949136455 100644 --- a/libc/include/netdb.h +++ b/libc/include/netdb.h @@ -209,8 +209,8 @@ void endnetgrent(void); void endprotoent(void); void endservent(void); void freehostent(struct hostent *); -struct hostent *gethostbyaddr(const char *, int, int); -int gethostbyaddr_r(const char *, int, int, struct hostent *, char *, size_t, struct hostent **, int *); +struct hostent *gethostbyaddr(const void *, int, int); +int gethostbyaddr_r(const void *, int, int, struct hostent *, char *, size_t, struct hostent **, int *); struct hostent *gethostbyname(const char *); int gethostbyname_r(const char *, struct hostent *, char *, size_t, struct hostent **, int *); struct hostent *gethostbyname2(const char *, int); diff --git a/libc/include/netinet/ip.h b/libc/include/netinet/ip.h index 541905c13..629ed77b0 100644 --- a/libc/include/netinet/ip.h +++ b/libc/include/netinet/ip.h @@ -83,7 +83,7 @@ struct ip { #define IPTOS_LOWDELAY 0x10 #define IPTOS_THROUGHPUT 0x08 #define IPTOS_RELIABILITY 0x04 -/* IPTOS_LOWCOST 0x02 XXX */ +#define IPTOS_MINCOST 0x02 #if 1 /* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */ #define IPTOS_CE 0x01 /* congestion experienced */ diff --git a/libc/netbsd/gethnamaddr.c b/libc/netbsd/gethnamaddr.c index 3ebe53e2c..fb1886969 100644 --- a/libc/netbsd/gethnamaddr.c +++ b/libc/netbsd/gethnamaddr.c @@ -637,7 +637,7 @@ gethostbyname_internal(const char *name, int af, res_state res) } struct hostent * -gethostbyaddr(const char *addr, /* XXX should have been def'd as u_char! */ +gethostbyaddr(const void *addr, socklen_t len, int af) { const u_char *uaddr = (const u_char *)addr; |