From 51ee3ccd5933cc55904b01733decaf5e52f93be8 Mon Sep 17 00:00:00 2001 From: Nikolas Klauser Date: Wed, 3 Dec 2025 11:13:07 +0100 Subject: [PATCH] [libc++] Remove headers from the locale base API which just include another header --- libcxx/include/__locale_dir/locale_base_api.h | 8 ++------ libcxx/include/__locale_dir/support/apple.h | 20 ------------------- libcxx/include/__locale_dir/support/freebsd.h | 20 ------------------- libcxx/include/__locale_dir/support/netbsd.h | 20 ------------------- 4 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 libcxx/include/__locale_dir/support/apple.h delete mode 100644 libcxx/include/__locale_dir/support/freebsd.h delete mode 100644 libcxx/include/__locale_dir/support/netbsd.h diff --git a/libcxx/include/__locale_dir/locale_base_api.h b/libcxx/include/__locale_dir/locale_base_api.h index d26d529d4e0c2..6b10ffb95cd63 100644 --- a/libcxx/include/__locale_dir/locale_base_api.h +++ b/libcxx/include/__locale_dir/locale_base_api.h @@ -106,12 +106,8 @@ #if _LIBCPP_HAS_LOCALIZATION -# if defined(__APPLE__) -# include <__locale_dir/support/apple.h> -# elif defined(__FreeBSD__) -# include <__locale_dir/support/freebsd.h> -# elif defined(__NetBSD__) -# include <__locale_dir/support/netbsd.h> +# if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) +# include <__locale_dir/support/bsd_like.h> # elif defined(_LIBCPP_MSVCRT_LIKE) # include <__locale_dir/support/windows.h> # elif defined(__Fuchsia__) diff --git a/libcxx/include/__locale_dir/support/apple.h b/libcxx/include/__locale_dir/support/apple.h deleted file mode 100644 index 62eb79c30d435..0000000000000 --- a/libcxx/include/__locale_dir/support/apple.h +++ /dev/null @@ -1,20 +0,0 @@ -//===-----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H -#define _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H - -#include <__config> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -#include <__locale_dir/support/bsd_like.h> - -#endif // _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H diff --git a/libcxx/include/__locale_dir/support/freebsd.h b/libcxx/include/__locale_dir/support/freebsd.h deleted file mode 100644 index 5c6e21e387271..0000000000000 --- a/libcxx/include/__locale_dir/support/freebsd.h +++ /dev/null @@ -1,20 +0,0 @@ -//===-----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H -#define _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H - -#include <__config> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -#include <__locale_dir/support/bsd_like.h> - -#endif // _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H diff --git a/libcxx/include/__locale_dir/support/netbsd.h b/libcxx/include/__locale_dir/support/netbsd.h deleted file mode 100644 index 190857f6f84fe..0000000000000 --- a/libcxx/include/__locale_dir/support/netbsd.h +++ /dev/null @@ -1,20 +0,0 @@ -//===-----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H -#define _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H - -#include <__config> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -#include <__locale_dir/support/bsd_like.h> - -#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H