diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-14 13:21:54 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-14 13:21:54 -0700 |
| commit | 8cde538c6df89d9e7b2bdd7b8def9044f638fb60 (patch) | |
| tree | 7d9ec60ca26ac4548ecb0def834d246d0e31a0b9 /host/include | |
| parent | 4e5dacc20770d557140cf196750326934e6e6b40 (diff) | |
| parent | 938a1b5c9fdeba069a060733f4a6f84dce1762c6 (diff) | |
| download | uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.tar.gz uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.tar.bz2 uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/config.h | 6 | ||||
| -rw-r--r-- | host/include/uhd/config.hpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/host/include/uhd/config.h b/host/include/uhd/config.h index 1d6cefcc0..1677c80ec 100644 --- a/host/include/uhd/config.h +++ b/host/include/uhd/config.h @@ -1,5 +1,5 @@ // -// Copyright 2015 Ettus Research LLC +// Copyright 2015-2016 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 @@ -69,13 +69,13 @@ typedef ptrdiff_t ssize_t; // Platform defines for conditional code: // Taken from boost/config/select_platform_config.hpp, // However, we define macros, not strings, for platforms. -#if defined(linux) || defined(__linux) || defined(__linux__) +#if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__)) && !defined(_CRAYC) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #define UHD_PLATFORM_LINUX #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #define UHD_PLATFORM_WIN32 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #define UHD_PLATFORM_MACOS -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #define UHD_PLATFORM_BSD #endif diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index ecd260675..8cbcab860 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011,2014-2015 Ettus Research LLC +// Copyright 2010-2011,2014-2016 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 @@ -93,13 +93,13 @@ typedef ptrdiff_t ssize_t; // Platform defines for conditional parts of headers: // Taken from boost/config/select_platform_config.hpp, // however, we define macros, not strings for platforms. -#if defined(linux) || defined(__linux) || defined(__linux__) +#if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__)) && !defined(_CRAYC) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #define UHD_PLATFORM_LINUX #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #define UHD_PLATFORM_WIN32 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #define UHD_PLATFORM_MACOS -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #define UHD_PLATFORM_BSD #endif |