Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libcxx/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,6 @@ set(files
__locale
__locale_dir/locale_base_api.h
__locale_dir/locale_base_api/android.h
__locale_dir/locale_base_api/bsd_locale_defaults.h
__locale_dir/locale_base_api/bsd_locale_fallbacks.h
__locale_dir/locale_base_api/fuchsia.h
__locale_dir/locale_base_api/ibm.h
Expand Down
4 changes: 0 additions & 4 deletions libcxx/include/__config
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,6 @@ typedef __char32_t char32_t;
# define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x)
# endif // _LIBCPP_CXX03_LANG

# if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || defined(__NetBSD__)
# define _LIBCPP_LOCALE__L_EXTENSIONS 1
# endif

# ifdef __FreeBSD__
# define _DECLARE_C99_LDBL_MATH 1
# endif
Expand Down
6 changes: 1 addition & 5 deletions libcxx/include/__locale_dir/locale_base_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@
# include <__locale_dir/locale_base_api/musl.h>
# endif

# ifdef _LIBCPP_LOCALE__L_EXTENSIONS
# include <__locale_dir/locale_base_api/bsd_locale_defaults.h>
# else
# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>
# endif
# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>

# include <__cstddef/size_t.h>
# include <__utility/forward.h>
Expand Down
116 changes: 0 additions & 116 deletions libcxx/include/__locale_dir/locale_base_api/bsd_locale_defaults.h

This file was deleted.

2 changes: 1 addition & 1 deletion libcxx/include/locale
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ template <class charT> class messages_byname;
# include <streambuf>
# include <version>

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

# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
Expand Down
1 change: 0 additions & 1 deletion libcxx/include/module.modulemap
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,6 @@ module std [system] {

module locale_base_api {
textual header "__locale_dir/locale_base_api/android.h"
textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h"
textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h"
textual header "__locale_dir/locale_base_api/fuchsia.h"
textual header "__locale_dir/locale_base_api/ibm.h"
Expand Down
Loading