Skip to content

Commit

Permalink
[libc++][NFC] Fix include guards inside locale_base_api
Browse files Browse the repository at this point in the history
  • Loading branch information
ldionne committed Oct 25, 2024
1 parent 21ecd4a commit 800a47d
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/android.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H

#include <stdlib.h>

Expand Down Expand Up @@ -47,4 +47,4 @@ inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr
# endif // __NDK_MAJOR__ <= 16
#endif // __has_include(<android/ndk-version.h>)

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
// we will define the mapping from an internal macro to the real BSD symbol.
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
Expand All @@ -33,4 +33,4 @@
#define __libcpp_asprintf_l(...) asprintf_l(__VA_ARGS__)
#define __libcpp_sscanf_l(...) sscanf_l(__VA_ARGS__)

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
// of those functions for non-BSD platforms.
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H

#include <__locale_dir/locale_base_api/locale_guard.h>
#include <cstdio>
Expand Down Expand Up @@ -123,4 +123,4 @@ inline _LIBCPP_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __libcpp_sscanf_l(

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/fuchsia.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_FUCHSIA_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_FUCHSIA_H

#include <__support/xlocale/__posix_l_fallback.h>
#include <__support/xlocale/__strtonum_fallback.h>
#include <cstdlib>
#include <cwchar>

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_FUCHSIA_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/ibm.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H

#if defined(__MVS__)
# include <__support/ibm/locale_mgmt_zos.h>
Expand Down Expand Up @@ -105,4 +105,4 @@ _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int vasprintf(char** strp, const char
return str_size;
}

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/locale_guard.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_LOCALE_GUARD_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_LOCALE_GUARD_H

#include <__config>
#include <__locale> // for locale_t
Expand Down Expand Up @@ -75,4 +75,4 @@ struct __libcpp_locale_guard {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_LOCALE_GUARD_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/musl.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
// in Musl.
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H

#include <cstdlib>
#include <cwchar>
Expand All @@ -28,4 +28,4 @@ inline _LIBCPP_HIDE_FROM_ABI unsigned long long strtoull_l(const char* __nptr, c
return ::strtoull(__nptr, __endptr, __base);
}

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/newlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/openbsd.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H

#include <__support/xlocale/__strtonum_fallback.h>
#include <clocale>
#include <cstdlib>
#include <ctype.h>
#include <cwctype>

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
6 changes: 3 additions & 3 deletions libcxx/include/__locale_dir/locale_base_api/win32.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
#define _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_WIN32_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_WIN32_H

#include <__config>
#include <cstddef>
Expand Down Expand Up @@ -232,4 +232,4 @@ _LIBCPP_EXPORTED_FROM_ABI int vasprintf_l(char** __ret, locale_t __loc, const ch
// not-so-pressing FIXME: use locale to determine blank characters
inline int iswblank_l(wint_t __c, locale_t /*loc*/) { return (__c == L' ' || __c == L'\t'); }

#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_WIN32_H

0 comments on commit 800a47d

Please sign in to comment.