| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-06-06 03:14:03+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-06-06 11:22:20+02:00 |
| log | b6d904624296dc5c60c34d8613d6c261e60328cf |
| tree | 8a8d392fae6a5067aa8b1f979b84dc4f2b99221b |
| parent | 98cf81d51c7c5b5cd6b6840007ce05cd0cc94143 |
libcxx: Fix locale-related compilation errors on NetBSD.
llvm/llvm-project#1430555 files changed, 26 insertions(+), 2 deletions(-)
lib- libcxx
- include
- __locale_dir
lib/libcxx/include/__locale_dir/locale_base_api.h+2
| ... | @@ -115,6 +115,8 @@ | ... | @@ -115,6 +115,8 @@ |
| 115 | # include <__locale_dir/support/apple.h> | 115 | # include <__locale_dir/support/apple.h> |
| 116 | #elif defined(__FreeBSD__) | 116 | #elif defined(__FreeBSD__) |
| 117 | # include <__locale_dir/support/freebsd.h> | 117 | # include <__locale_dir/support/freebsd.h> |
| 118 | #elif defined(__NetBSD__) | ||
| 119 | # include <__locale_dir/support/netbsd.h> | ||
| 118 | #elif defined(_LIBCPP_MSVCRT_LIKE) | 120 | #elif defined(_LIBCPP_MSVCRT_LIKE) |
| 119 | # include <__locale_dir/support/windows.h> | 121 | # include <__locale_dir/support/windows.h> |
| 120 | #elif defined(__Fuchsia__) | 122 | #elif defined(__Fuchsia__) |
lib/libcxx/include/__locale_dir/support/apple.h+2
| ... | @@ -15,6 +15,8 @@ | ... | @@ -15,6 +15,8 @@ |
| 15 | # pragma GCC system_header | 15 | # pragma GCC system_header |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | #include <xlocale.h> | ||
| 19 | |||
| 18 | #include <__locale_dir/support/bsd_like.h> | 20 | #include <__locale_dir/support/bsd_like.h> |
| 19 | 21 | ||
| 20 | #endif // _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H | 22 | #endif // _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H |
lib/libcxx/include/__locale_dir/support/bsd_like.h-2
| ... | @@ -24,8 +24,6 @@ | ... | @@ -24,8 +24,6 @@ |
| 24 | # include <wctype.h> | 24 | # include <wctype.h> |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #include <xlocale.h> | ||
| 28 | |||
| 29 | #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) | 27 | #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) |
| 30 | # pragma GCC system_header | 28 | # pragma GCC system_header |
| 31 | #endif | 29 | #endif |
lib/libcxx/include/__locale_dir/support/freebsd.h+2
| ... | @@ -15,6 +15,8 @@ | ... | @@ -15,6 +15,8 @@ |
| 15 | # pragma GCC system_header | 15 | # pragma GCC system_header |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | #include <xlocale.h> | ||
| 19 | |||
| 18 | #include <__locale_dir/support/bsd_like.h> | 20 | #include <__locale_dir/support/bsd_like.h> |
| 19 | 21 | ||
| 20 | #endif // _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H | 22 | #endif // _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H |
lib/libcxx/include/__locale_dir/support/netbsd.h created+20
| ... | @@ -0,0 +1,20 @@ | ||
| 1 | //===-----------------------------------------------------------------------===// | ||
| 2 | // | ||
| 3 | // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| 4 | // See https://llvm.org/LICENSE.txt for license information. | ||
| 5 | // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| 6 | // | ||
| 7 | //===----------------------------------------------------------------------===// | ||
| 8 | |||
| 9 | #ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H | ||
| 10 | #define _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H | ||
| 11 | |||
| 12 | #include <__config> | ||
| 13 | |||
| 14 | #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) | ||
| 15 | # pragma GCC system_header | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #include <__locale_dir/support/bsd_like.h> | ||
| 19 | |||
| 20 | #endif // _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H | ||