aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-12-15 20:47:14 -0600
committerElliott Hughes2014-12-15 20:47:14 -0600
commitbadd7e1a58fc2ce704fd8fc2a1f335bd30a67542 (patch)
treeb149a0df132d1eb4fdd47077cdd4564a256f796f
parentad01c9831918ecae815db2406022ef69e74f6e6d (diff)
downloadplatform-bionic-badd7e1a58fc2ce704fd8fc2a1f335bd30a67542.tar.gz
platform-bionic-badd7e1a58fc2ce704fd8fc2a1f335bd30a67542.tar.xz
platform-bionic-badd7e1a58fc2ce704fd8fc2a1f335bd30a67542.zip
Fix <net/route.h>.
Previously it couldn't be included alone. Also add a header and include guard, and fix its siblings' include guards. Bug: https://code.google.com/p/android/issues/detail?id=82638 Change-Id: I32139a4bda0a6b015508a2319bf4e1a1453345f2
-rw-r--r--libc/include/net/ethernet.h7
-rw-r--r--libc/include/net/if.h6
-rw-r--r--libc/include/net/route.h35
3 files changed, 46 insertions, 2 deletions
diff --git a/libc/include/net/ethernet.h b/libc/include/net/ethernet.h
index b1b88dd0..47858b33 100644
--- a/libc/include/net/ethernet.h
+++ b/libc/include/net/ethernet.h
@@ -25,8 +25,11 @@
25 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28
28#ifndef _NET_ETHERNET_H_ 29#ifndef _NET_ETHERNET_H_
29#define _NET_IF_ETHERNET_H_ 30#define _NET_ETHERNET_H_
31
30#include <linux/if_ether.h> 32#include <linux/if_ether.h>
31#include <net/if_ether.h> 33#include <net/if_ether.h>
32#endif /* !_NET_ETHERNET_H_ */ 34
35#endif
diff --git a/libc/include/net/if.h b/libc/include/net/if.h
index f36f37ea..0efbf7fc 100644
--- a/libc/include/net/if.h
+++ b/libc/include/net/if.h
@@ -26,9 +26,13 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#ifndef _NET_IF_H_
30#define _NET_IF_H_
31
29#include <sys/socket.h> 32#include <sys/socket.h>
30#include <linux/if.h> 33#include <linux/if.h>
31#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35
32#ifndef IF_NAMESIZE 36#ifndef IF_NAMESIZE
33#define IF_NAMESIZE IFNAMSIZ 37#define IF_NAMESIZE IFNAMSIZ
34#endif 38#endif
@@ -42,3 +46,5 @@ extern unsigned int if_nametoindex(const char *);
42extern char* if_indextoname(unsigned ifindex, char *ifname); 46extern char* if_indextoname(unsigned ifindex, char *ifname);
43 47
44__END_DECLS 48__END_DECLS
49
50#endif
diff --git a/libc/include/net/route.h b/libc/include/net/route.h
index d26bfc9c..326fbe7c 100644
--- a/libc/include/net/route.h
+++ b/libc/include/net/route.h
@@ -1,2 +1,37 @@
1/*
2 * Copyright (C) 2014 The Android Open Source Project
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in
12 * the documentation and/or other materials provided with the
13 * distribution.
14 *
15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
17 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
18 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
19 * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
22 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
25 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#ifndef _NET_ROUTE_H_
30#define _NET_ROUTE_H_
31
32#include <sys/socket.h>
1#include <linux/route.h> 33#include <linux/route.h>
34#include <linux/in6.h>
2#include <linux/ipv6_route.h> 35#include <linux/ipv6_route.h>
36
37#endif