diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-19 20:11:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 15:49:56 +0000 |
| commit | c5d6df6f2fe57fd5aadbd9ebb131023234c30a0c (patch) | |
| tree | 32a4a9fb33b86fdd69ed2db974e9c8bf2cc747af /libc/include | |
| parent | 6f4220c49e90b18a50d36e47cc9287c7593af939 (diff) | |
| parent | 35d226e05d92824c6eb992e7a64ea22efc8bae03 (diff) | |
| download | android_bionic-c5d6df6f2fe57fd5aadbd9ebb131023234c30a0c.tar.gz android_bionic-c5d6df6f2fe57fd5aadbd9ebb131023234c30a0c.tar.bz2 android_bionic-c5d6df6f2fe57fd5aadbd9ebb131023234c30a0c.zip | |
Merge "Add in_port_t and move it and in_addr_t to the correct header file."
Diffstat (limited to 'libc/include')
| -rw-r--r-- | libc/include/arpa/inet.h | 3 | ||||
| -rw-r--r-- | libc/include/netinet/in.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libc/include/arpa/inet.h b/libc/include/arpa/inet.h index 067be1fe9..86265bf24 100644 --- a/libc/include/arpa/inet.h +++ b/libc/include/arpa/inet.h @@ -25,6 +25,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #ifndef _ARPA_INET_H_ #define _ARPA_INET_H_ @@ -34,8 +35,6 @@ __BEGIN_DECLS -typedef uint32_t in_addr_t; - in_addr_t inet_addr(const char*); int inet_aton(const char*, struct in_addr*); in_addr_t inet_lnaof(struct in_addr); diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h index bf3b498c4..44c7fc1a6 100644 --- a/libc/include/netinet/in.h +++ b/libc/include/netinet/in.h @@ -25,6 +25,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #ifndef _NETINET_IN_H_ #define _NETINET_IN_H_ @@ -43,6 +44,9 @@ __BEGIN_DECLS #define INET_ADDRSTRLEN 16 +typedef uint16_t in_port_t; +typedef uint32_t in_addr_t; + extern int bindresvport (int sd, struct sockaddr_in *sin); static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; |