From e8c4db180d08f730659851f6fe805e912f4685da Mon Sep 17 00:00:00 2001 From: david Date: Wed, 21 Mar 2012 23:14:26 +0000 Subject: [PATCH] Don't duplicate #ifdefs. --- libnetutil/netutil.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index 1590d68e3..02a71b541 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -873,12 +873,10 @@ int pcap_selectable_fd_valid() { results. If you just want to test whether the function is supported, use pcap_selectable_fd_valid() instead. */ int my_pcap_get_selectable_fd(pcap_t *p) { -#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) - return -1; -#else - assert(pcap_selectable_fd_valid()); - return pcap_get_selectable_fd(p); -#endif + if (pcap_selectable_fd_valid()) + return pcap_get_selectable_fd(p); + else + return -1; }