From 317a47728360e3fec70c1eade0ffa21f535040c0 Mon Sep 17 00:00:00 2001 From: Rafael Sadowski Date: Sun, 11 Apr 2021 15:06:47 +0200 Subject: OpenBSD: Fix system feature definitions Since commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2), some sources explicitly enable needed system APIs on some platforms using definitions like `_POSIX_C_SOURCE` and `_XOPEN_SOURCE`. Drop the definitions for OpenBSD, which provides the POSIX APIs by default. --- Source/cmLoadCommandCommand.cxx | 4 ++-- Source/cmStandardLexer.h | 5 +++-- Source/cmSystemTools.cxx | 5 ++--- 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 0807590..c1ce7ec 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 -- cgit v0.12