From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 30 Mar 2011 23:09:34 +0000 (+0200)
Subject: linux: bind IFNAMSIZ from linux/if.h to fix net/if.h conflict
X-Git-Tag: 0.12.0~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2d7b2d43bad54e2165aed209a88c21cbab677a4;p=thirdparty%2Fvala.git

linux: bind IFNAMSIZ from linux/if.h to fix net/if.h conflict

add necessary netinet/in.h include to Linux.Network.IfReq
---

diff --git a/vapi/linux.vapi b/vapi/linux.vapi
index 9407d36ca..1087bcc35 100644
--- a/vapi/linux.vapi
+++ b/vapi/linux.vapi
@@ -1181,8 +1181,8 @@ namespace Linux {
     namespace Network {
 
         // interface consts, structs, and methods
-        [CCode (cheader_filename = "net/if.h")]
-        public const int IF_NAMESIZ;
+        [CCode (cname = "IFNAMSIZ", cheader_filename = "linux/if.h")]
+        public const int INTERFACE_NAME_SIZE;
 
         [CCode (cheader_filename = "net/if.h")]
         public uint if_nametoindex (string ifname);
@@ -1226,7 +1226,7 @@ namespace Linux {
             public uchar port;
         }
 
-        [CCode (cname = "struct ifreq", cheader_filename = "linux/if.h", destroy_function = "")]
+        [CCode (cname = "struct ifreq", cheader_filename = "netinet/in.h,linux/if.h", destroy_function = "")]
         public struct IfReq {
             public char[] ifr_name;
             public Posix.SockAddr ifr_addr;