diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:44:25 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:44:25 -0800 |
| commit | 5015fe9bf8869e794cfd972189876e5ff67a3a77 (patch) | |
| tree | ac5fbd6139872dbaabf3c3fa01d1ad3af441d72f /libc/include/netinet | |
| parent | 7f687eb12e9977215416469c3edfc9f464a5883c (diff) | |
| parent | f29c214d6ad97f9a5348407cc66a58aec2228ca9 (diff) | |
| download | bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.zip bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.tar.gz bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/bionic into mr1
Conflicts:
libc/Android.mk
libc/bionic/system_properties.c
libc/kernel/common/linux/msm_mdp.h
libc/tools/gensyscalls.py
libm/Android.mk
linker/linker.c
Change-Id: I11944300d7fcf2fd9dc587d8c7a937bf5366bcc0
Diffstat (limited to 'libc/include/netinet')
| -rw-r--r-- | libc/include/netinet/if_ether.h | 2 | ||||
| -rw-r--r-- | libc/include/netinet/in.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/include/netinet/if_ether.h b/libc/include/netinet/if_ether.h index 700b9db..e4317fa 100644 --- a/libc/include/netinet/if_ether.h +++ b/libc/include/netinet/if_ether.h @@ -25,6 +25,8 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include <sys/socket.h> #include <linux/if_ether.h> #include <linux/if_arp.h> #ifndef ETHER_ADDR_LEN diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h index 01bf58e..c5b964e 100644 --- a/libc/include/netinet/in.h +++ b/libc/include/netinet/in.h @@ -29,7 +29,7 @@ #define _NETINET_IN_H_ #include <endian.h> -#include <linux/socket.h> +#include <sys/socket.h> #include <linux/in.h> #include <linux/in6.h> #include <linux/ipv6.h> |