Skip to content

Commit c664a7f

Browse files
authored
[libc++] Remove obsolete bsd_locale_defaults.h (#122276)
Supported platforms who used to need this header now go through the new locale base API instead, so that header is not required anymore.
1 parent 9d7df23 commit c664a7f

File tree

6 files changed

+2
-128
lines changed

6 files changed

+2
-128
lines changed

libcxx/include/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ set(files
498498
__locale
499499
__locale_dir/locale_base_api.h
500500
__locale_dir/locale_base_api/android.h
501-
__locale_dir/locale_base_api/bsd_locale_defaults.h
502501
__locale_dir/locale_base_api/bsd_locale_fallbacks.h
503502
__locale_dir/locale_base_api/fuchsia.h
504503
__locale_dir/locale_base_api/ibm.h

libcxx/include/__config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,6 @@ typedef __char32_t char32_t;
629629
# define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x)
630630
# endif // _LIBCPP_CXX03_LANG
631631

632-
# if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || defined(__NetBSD__)
633-
# define _LIBCPP_LOCALE__L_EXTENSIONS 1
634-
# endif
635-
636632
# ifdef __FreeBSD__
637633
# define _DECLARE_C99_LDBL_MATH 1
638634
# endif

libcxx/include/__locale_dir/locale_base_api.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,7 @@
117117
# include <__locale_dir/locale_base_api/musl.h>
118118
# endif
119119

120-
# ifdef _LIBCPP_LOCALE__L_EXTENSIONS
121-
# include <__locale_dir/locale_base_api/bsd_locale_defaults.h>
122-
# else
123-
# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>
124-
# endif
120+
# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>
125121

126122
# include <__cstddef/size_t.h>
127123
# include <__utility/forward.h>

libcxx/include/__locale_dir/locale_base_api/bsd_locale_defaults.h

Lines changed: 0 additions & 116 deletions
This file was deleted.

libcxx/include/locale

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ template <class charT> class messages_byname;
219219
# include <streambuf>
220220
# include <version>
221221

222-
// TODO: Properly qualify calls now that __bsd_locale_defaults.h defines functions instead of macros
222+
// TODO: Properly qualify calls now that the locale base API defines functions instead of macros
223223
// NOLINTBEGIN(libcpp-robust-against-adl)
224224

225225
# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))

libcxx/include/module.modulemap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,6 @@ module std [system] {
14831483

14841484
module locale_base_api {
14851485
textual header "__locale_dir/locale_base_api/android.h"
1486-
textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h"
14871486
textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h"
14881487
textual header "__locale_dir/locale_base_api/fuchsia.h"
14891488
textual header "__locale_dir/locale_base_api/ibm.h"

0 commit comments

Comments
 (0)