Use the availability macro properly(?)

Author: smallp-o-p

libcxx/include/__text_encoding/te_impl.h

@@ -531,14 +531,13 @@ struct __te_impl {
   _LIBCPP_HIDDEN static __id __get_win32_acp();
 #    endif
 
-#    if _LIBCPP_AVAILABILITY_HAS_TE_ENVIRONMENT
-  [[nodiscard]] _LIBCPP_EXPORTED_FROM_ABI static __te_impl __environment();
+  [[nodiscard]] _LIBCPP_AVAILABILITY_TE_ENVIRONMENT _LIBCPP_EXPORTED_FROM_ABI static __te_impl __environment();
 
   template <__id _Id>
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool __environment_is() {
+  [[nodiscard]] _LIBCPP_AVAILABILITY_TE_ENVIRONMENT _LIBCPP_HIDE_FROM_ABI static bool __environment_is() {
     return __environment() == _Id;
   }
-#    endif
+
 #  endif
 
   const __te_data* __encoding_rep_     = __text_encoding_data + 1;

libcxx/include/text_encoding

@@ -107,12 +107,12 @@ public:
     return text_encoding(__te_impl::__literal());
   }
 #    if _LIBCPP_HAS_LOCALIZATION && !defined(__ANDROID__)
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static text_encoding environment() {
+  [[nodiscard]] _LIBCPP_AVAILABILITY_TE_ENVIRONMENT _LIBCPP_HIDE_FROM_ABI static text_encoding environment() {
     return text_encoding(__te_impl::__environment());
   };
 
   template <id _Id>
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool environment_is() {
+  [[nodiscard]] _LIBCPP_AVAILABILITY_TE_ENVIRONMENT _LIBCPP_HIDE_FROM_ABI static bool environment_is() {
     return __te_impl::__environment_is<_Id>();
   }
 #    else

libcxx/src/text_encoding.cpp

@@ -249,6 +249,8 @@ _LIBCPP_HIDDEN __te_impl __te_impl::__get_env_encoding() {
 #endif // _LIBCPP_WIN32API
 }
 
-__te_impl __te_impl::__environment() { return __te_impl::__get_env_encoding(); }
+_LIBCPP_AVAILABILITY_TE_ENVIRONMENT _LIBCPP_EXPORTED_FROM_ABI __te_impl __te_impl::__environment() {
+  return __te_impl::__get_env_encoding();
+}
 
 _LIBCPP_END_NAMESPACE_STD