diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-07-03 17:48:21 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-07-03 17:48:21 +0000 |
| commit | 7a900c81b300906a3037e9793f005ad351aafd15 (patch) | |
| tree | c231cca46a898362d548a05fd744f6f18ba6a2f7 /iface_monitor.c | |
| parent | a16c3e2692bd6f7026f4b55bc53e7846773c361c (diff) | |
| download | wireshark-7a900c81b300906a3037e9793f005ad351aafd15.tar.gz wireshark-7a900c81b300906a3037e9793f005ad351aafd15.tar.bz2 wireshark-7a900c81b300906a3037e9793f005ad351aafd15.zip | |
From Pontus Fuchs on -dev:
Fix collision between net/if.h and linux/if.h (which is included by libnl3).
svn path=/trunk/; revision=43557
Diffstat (limited to 'iface_monitor.c')
| -rw-r--r-- | iface_monitor.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/iface_monitor.c b/iface_monitor.c index 71c72e1c3f..76db4938b1 100644 --- a/iface_monitor.c +++ b/iface_monitor.c @@ -37,7 +37,9 @@ #include <strings.h> #include <errno.h> +#if defined(HAVE_LIBNL1) || defined(HAVE_LIBNL2) #include <net/if.h> +#endif #include <netlink/msg.h> #include <netlink/attr.h> |