Auto merge of #1366 - Susurrus:iff_constants, r=gnzlbg

Change datatype for some IFF_ constants

These were originally added as c_short types, but all other IFF_ constants
are c_int. This commit changes them to match all the other constants for
consistency.

Closes #915

Author: bors

src/unix/notbsd/linux/mod.rs

@@ -1059,25 +1059,25 @@ pub const IFLA_QDISC: ::c_ushort = 6;
 pub const IFLA_STATS: ::c_ushort = 7;
 
 // linux/if_tun.h
-pub const IFF_TUN: ::c_short = 0x0001;
-pub const IFF_TAP: ::c_short = 0x0002;
-pub const IFF_NO_PI: ::c_short = 0x1000;
+pub const IFF_TUN: ::c_int = 0x0001;
+pub const IFF_TAP: ::c_int = 0x0002;
+pub const IFF_NO_PI: ::c_int = 0x1000;
 // Read queue size
 pub const TUN_READQ_SIZE: ::c_short = 500;
 // TUN device type flags: deprecated. Use IFF_TUN/IFF_TAP instead.
-pub const TUN_TUN_DEV: ::c_short   = ::IFF_TUN;
-pub const TUN_TAP_DEV: ::c_short   = ::IFF_TAP;
+pub const TUN_TUN_DEV: ::c_short   = ::IFF_TUN as ::c_short;
+pub const TUN_TAP_DEV: ::c_short   = ::IFF_TAP as ::c_short;
 pub const TUN_TYPE_MASK: ::c_short = 0x000f;
 // This flag has no real effect
-pub const IFF_ONE_QUEUE: ::c_short    = 0x2000;
-pub const IFF_VNET_HDR: ::c_short     = 0x4000;
-pub const IFF_TUN_EXCL: ::c_short     = 0x8000;
-pub const IFF_MULTI_QUEUE: ::c_short  = 0x0100;
-pub const IFF_ATTACH_QUEUE: ::c_short = 0x0200;
-pub const IFF_DETACH_QUEUE: ::c_short = 0x0400;
+pub const IFF_ONE_QUEUE: ::c_int    = 0x2000;
+pub const IFF_VNET_HDR: ::c_int     = 0x4000;
+pub const IFF_TUN_EXCL: ::c_int     = 0x8000;
+pub const IFF_MULTI_QUEUE: ::c_int  = 0x0100;
+pub const IFF_ATTACH_QUEUE: ::c_int = 0x0200;
+pub const IFF_DETACH_QUEUE: ::c_int = 0x0400;
 // read-only flag
-pub const IFF_PERSIST: ::c_short  = 0x0800;
-pub const IFF_NOFILTER: ::c_short = 0x1000;
+pub const IFF_PERSIST: ::c_int  = 0x0800;
+pub const IFF_NOFILTER: ::c_int = 0x1000;
 
 pub const ST_RDONLY: ::c_ulong = 1;
 pub const ST_NOSUID: ::c_ulong = 2;