Merge pull request #185 from fornwall/struct-in6_flowlabel_req-already-defined-on-android

in6_flowlabel_req is already defined on Android
2014-06-17 13:00:22 -07:00 · 2014-06-17 13:00:22 -07:00 · edf9d4e8cf
commit edf9d4e8cf
parent 846ddcba74 58fd2c37fc
1 changed files with 2 additions and 0 deletions
--- a/src/flowlabel.h
+++ b/src/flowlabel.h
@ -19,6 +19,7 @@
   conflicts with "netinet/in.h" .
 */

+#ifndef __ANDROID__
 struct in6_flowlabel_req
 {
    struct in6_addr flr_dst;
@ -31,6 +32,7 @@ struct in6_flowlabel_req
    __u32   __flr_pad;
    /* Options in format of IPV6_PKTOPTIONS */
 };
+#endif

 #define IPV6_FL_A_GET           0
 #define IPV6_FL_A_PUT           1