This is an archive of the discontinued LLVM Phabricator instance.

Differential D111239

[libcxx][AIX] Explicitly include localedef.h in locale.cpp
ClosedPublic

Authored by daltenty on Oct 6 2021, 9:24 AM.

Details

Reviewers
hubert.reinterpretcast
ZarkoCA
ldionne
Group Reviewers
Restricted Project
Commits
rG1112b7bad851: [libcxx][AIX] Explicitly include localedef.h in locale.cpp
Summary

This header was transitively included to provide the definition of
__lc_ctype_ptr that we use on AIX, but that is fragile as it depends on
the settings of compatibility macros, so we explicitly include it here
to avoid that scenario.

Diff Detail

Event Timeline

daltenty requested review of this revision.Oct 6 2021, 9:24 AM
daltenty created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 6 2021, 9:24 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B127319: Diff 377570.Oct 6 2021, 1:30 PM
ldionne accepted this revision.Oct 12 2021, 8:06 AM
ldionne added a subscriber: ldionne.

LGTM

libcxx/src/locale.cpp
27–29

For consistency with surrounding code.

This revision is now accepted and ready to land.Oct 12 2021, 8:06 AM
daltenty updated this revision to Diff 379060.Oct 12 2021, 8:53 AM
daltenty marked an inline comment as done.
  • Apply comments
daltenty updated this revision to Diff 379062.Oct 12 2021, 8:59 AM
  • Rebase onto latest main
This revision was landed with ongoing or failed builds.Oct 12 2021, 9:00 AM
Closed by commit rG1112b7bad851: [libcxx][AIX] Explicitly include localedef.h in locale.cpp (authored by daltenty). · Explain Why
This revision was automatically updated to reflect the committed changes.
daltenty added a commit: rG1112b7bad851: [libcxx][AIX] Explicitly include localedef.h in locale.cpp.
Harbormaster completed remote builds in B128387: Diff 379062.Oct 12 2021, 10:06 AM

Revision Contents

PathSize
libcxx/
src/
4 lines

Diff 379063

libcxx/src/locale.cpp

Show All 18 Lines
#include "cstdlib" #include "cstdlib"
#include "cstring" #include "cstring"
#include "locale" #include "locale"
#include "string" #include "string"
#include "type_traits" #include "type_traits"
#include "typeinfo" #include "typeinfo"
#include "vector" #include "vector"
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
# include "cwctype" # include "cwctype"
#endif #endif
ldionneUnsubmitted
Done
ReplyInline Actions
#include "vector"
- #ifdef _AIX
- #include <sys/localedef.h>
+ #if defined(_AIX)
+ # include <sys/localedef.h> // for __lc_ctype_ptr
#endif
#if defined(_LIBCPP_MSVCRT)

For consistency with surrounding code.

ldionne: For consistency with surrounding code.
#if defined(_AIX)
# include <sys/localedef.h> // for __lc_ctype_ptr
#endif
#if defined(_LIBCPP_MSVCRT) #if defined(_LIBCPP_MSVCRT)
# define _CTYPE_DISABLE_MACROS # define _CTYPE_DISABLE_MACROS
#endif #endif
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__) #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
# include "__support/win32/locale_win32.h" # include "__support/win32/locale_win32.h"
#elif !defined(__BIONIC__) && !defined(__NuttX__) #elif !defined(__BIONIC__) && !defined(__NuttX__)
# include <langinfo.h> # include <langinfo.h>
▲ Show 20 Lines • Show All 6,513 Lines • Show Last 20 Lines