diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-07-20 13:55:17 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-07-20 13:55:17 -0700 |
| commit | ccb4e5ad4882792830c61a27a4badf8148513c28 (patch) | |
| tree | be0d5f937a1ca9a3227b8ca615e43a809ece50f7 /host/include | |
| parent | b95f8af1da6640f09b3cc2491ab9a22a139e24ba (diff) | |
| parent | af42e93a6e71c9b7ed03e6a208c8f4adfa74b68e (diff) | |
| download | uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.tar.gz uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.tar.bz2 uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.zip | |
Merge branch 'master' into x300/rev7_support
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_driver_iface.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index c562f0ca5..2668c10b9 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -32,7 +32,7 @@ #ifdef _MSC_VER #pragma warning(default:4201) #endif -#elif !defined(UHD_PLATFORM_LINUX) +#elif defined(UHD_PLATFORM_MACOS) #include <IOKit/IOKitLib.h> #endif @@ -85,8 +85,10 @@ const uint32_t NIRIO_IOCTL_PRE_CLOSE = typedef int rio_dev_handle_t; #elif defined(UHD_PLATFORM_WIN32) typedef HANDLE rio_dev_handle_t; -#else +#elif defined(UHD_PLATFORM_MACOS) typedef io_connect_t rio_dev_handle_t; +#else + typedef int rio_dev_handle_t; #endif static const rio_dev_handle_t INVALID_RIO_HANDLE = ((rio_dev_handle_t)-1); |