diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-14 15:04:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-14 15:04:30 (GMT) |
| commit | 7981602368449e6dc63c5a32a50c19942fc857fc (patch) | |
| tree | 9a5064b80b21442f2962611ac1f4f4ed7837c8ec /Source | |
| parent | 1f91cf3442f9bc2555b80dabc3b428eac5720cae (diff) | |
| parent | 317a47728360e3fec70c1eade0ffa21f535040c0 (diff) | |
| download | CMake-7981602368449e6dc63c5a32a50c19942fc857fc.zip CMake-7981602368449e6dc63c5a32a50c19942fc857fc.tar.gz CMake-7981602368449e6dc63c5a32a50c19942fc857fc.tar.bz2 | |
Merge topic 'openbsd-defines'
317a477283 OpenBSD: Fix system feature definitions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6000
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLoadCommandCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmStandardLexer.h | 5 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 5 | ||||
| -rw-r--r-- | Source/cmTimestamp.cxx | 5 |
4 files changed, 9 insertions, 10 deletions
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 5a7b30f..2981ef8 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -1,12 +1,12 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#if !defined(_WIN32) && !defined(__sun) +#if !defined(_WIN32) && !defined(__sun) && !defined(__OpenBSD__) // POSIX APIs are needed // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _POSIX_C_SOURCE 200809L #endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) // For isascii // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 700 diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index 1da8c98..b871f5f 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -7,7 +7,8 @@ // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 600 #endif -#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun) +#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun) && \ + !defined(__OpenBSD__) /* POSIX APIs are needed */ // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _POSIX_C_SOURCE 200809L @@ -17,7 +18,7 @@ // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 600 #endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) /* For isascii */ // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 700 diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index e8e1018..3a438fd 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1,13 +1,12 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#if !defined(_WIN32) && !defined(__sun) +#if !defined(_WIN32) && !defined(__sun) && !defined(__OpenBSD__) // POSIX APIs are needed // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _POSIX_C_SOURCE 200809L #endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__QNX__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__QNX__) // For isascii // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 700 diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index b016530..056696d 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -1,13 +1,12 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#if !defined(_WIN32) && !defined(__sun) +#if !defined(_WIN32) && !defined(__sun) && !defined(__OpenBSD__) // POSIX APIs are needed // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _POSIX_C_SOURCE 200809L #endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__QNX__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__QNX__) // For isascii // NOLINTNEXTLINE(bugprone-reserved-identifier) # define _XOPEN_SOURCE 700 |