diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-19 12:43:50 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-10-29 11:49:45 -0700 |
| commit | eedbf70e8eae18ab28a36017632b80e23c398e53 (patch) | |
| tree | e593c3492f3d44f72d74d1611bf23ba0ac99f043 /libc | |
| parent | 1c8ea807ebb54c1533040b60c0a6394abc77e339 (diff) | |
| download | bionic-eedbf70e8eae18ab28a36017632b80e23c398e53.zip bionic-eedbf70e8eae18ab28a36017632b80e23c398e53.tar.gz bionic-eedbf70e8eae18ab28a36017632b80e23c398e53.tar.bz2 | |
Add in_port_t and move it and in_addr_t to the correct header file.
No one's reported this, but I saw it in an Android port of fuser(1).
We still have lots of problems in our network headers because we
get most of the structs direct from the kernel, and it doesn't use
types like this (which is why we've got away without this one for
so long). One day we should probably look at cleaning that up, but
doing so can wait.
(cherry picked from commit 35d226e05d92824c6eb992e7a64ea22efc8bae03)
Bug: 18172268
Change-Id: Ice490bfe84afb04722d738128053d4c533b8a664
Diffstat (limited to 'libc')
| -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 067be1f..86265bf 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 bf3b498..44c7fc1 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; |