diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-19 01:31:40 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-19 01:31:40 +0000 |
| commit | a9319441d688620e18d5621cc59b98769e670468 (patch) | |
| tree | 834918c47d69808ca163746788c7a1e0a14462aa /host/lib/transport | |
| parent | 2f9b6d5530df140a5a03120adc98a5ad32a69cc4 (diff) | |
| parent | 1c1d967ec73906d50ee6e7257a4153db4ab9c507 (diff) | |
| download | uhd-a9319441d688620e18d5621cc59b98769e670468.tar.gz uhd-a9319441d688620e18d5621cc59b98769e670468.tar.bz2 uhd-a9319441d688620e18d5621cc59b98769e670468.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/if_addrs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/transport/if_addrs.cpp b/host/lib/transport/if_addrs.cpp index 5c8c8a176..ad9a2325b 100644 --- a/host/lib/transport/if_addrs.cpp +++ b/host/lib/transport/if_addrs.cpp @@ -27,7 +27,7 @@ uhd::transport::if_addrs_t::if_addrs_t(void){ /*********************************************************************** * Interface address discovery through ifaddrs api **********************************************************************/ -#ifdef HAVE_IFADDRS_H +#if defined(HAVE_IFADDRS_H) #include <ifaddrs.h> static boost::asio::ip::address_v4 sockaddr_to_ip_addr(sockaddr *addr){ @@ -59,9 +59,9 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){ } /*********************************************************************** - * Interface address discovery through windows api (TODO) + * Interface address discovery through windows api **********************************************************************/ -#elif HAVE_WINSOCK2_H +#elif defined(HAVE_WINSOCK2_H) #include <winsock2.h> std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){ |