diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-07-20 10:36:36 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-07-20 13:05:27 -0700 |
| commit | b84c1c8f2d6e50efb1d013ad5c1315cfb20d68f8 (patch) | |
| tree | 9573934ad21237b5a93844f4c3a9d4a473bafe44 | |
| parent | 4de2c75da3ae14ac6b7f447db2d7bd0a04f6bdc8 (diff) | |
| download | uhd-b84c1c8f2d6e50efb1d013ad5c1315cfb20d68f8.tar.gz uhd-b84c1c8f2d6e50efb1d013ad5c1315cfb20d68f8.tar.bz2 uhd-b84c1c8f2d6e50efb1d013ad5c1315cfb20d68f8.zip | |
nirio: fixed defines for OS X vs. other unsupported platforms
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_driver_iface.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index 83afd816a..10df8e04e 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -1,5 +1,5 @@ // -// Copyright 2013-2014 Ettus Research LLC +// Copyright 2013-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union #include <WinIoCtl.h> #pragma warning(default:4201) -#elif !defined(UHD_PLATFORM_LINUX) +#elif defined(UHD_PLATFORM_MACOS) #include <IOKit/IOKitLib.h> #endif @@ -81,8 +81,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 //Unsupported platforms + typedef int rio_dev_handle_t; #endif static const rio_dev_handle_t INVALID_RIO_HANDLE = ((rio_dev_handle_t)-1); |