From: Louis Dionne <ldionne.2@gmail.com>
Date: Tue, 24 Aug 2021 14:37:07 +0000 (-0400)
Subject: [libc++] Remove workaround for missing declarations on Windows store apps
X-Git-Tag: upstream/15.0.7~13922
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a805a15b287f9afa63f127568619c300f756fd36;p=platform%2Fupstream%2Fllvm.git

[libc++] Remove workaround for missing declarations on Windows store apps

We don't need preprocessor logic to exclude those declarations when compiling for
the Windows App Store, because that is handled by using_if_exists now.

Differential Revision: https://reviews.llvm.org/D108632
---

diff --git a/libcxx/include/__config b/libcxx/include/__config
index 4d1e706..829478d 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -294,16 +294,6 @@
 #    define _LIBCPP_HAS_BITSCAN64
 #  endif
 #  define _LIBCPP_HAS_OPEN_WITH_WCHAR
-
-// Some CRT APIs are unavailable to store apps
-#  if defined(WINAPI_FAMILY)
-#    include <winapifamily.h>
-#    if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) &&                  \
-        (!defined(WINAPI_PARTITION_SYSTEM) ||                                  \
-         !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_SYSTEM))
-#      define _LIBCPP_WINDOWS_STORE_APP
-#    endif
-#  endif
 #endif // defined(_WIN32)
 
 #ifdef __sun__
diff --git a/libcxx/include/cstdlib b/libcxx/include/cstdlib
index 63a8cee..9fad7e1 100644
--- a/libcxx/include/cstdlib
+++ b/libcxx/include/cstdlib
@@ -115,10 +115,8 @@ using ::abort _LIBCPP_USING_IF_EXISTS;
 using ::atexit _LIBCPP_USING_IF_EXISTS;
 using ::exit _LIBCPP_USING_IF_EXISTS;
 using ::_Exit _LIBCPP_USING_IF_EXISTS;
-#ifndef _LIBCPP_WINDOWS_STORE_APP
 using ::getenv _LIBCPP_USING_IF_EXISTS;
 using ::system _LIBCPP_USING_IF_EXISTS;
-#endif
 using ::bsearch _LIBCPP_USING_IF_EXISTS;
 using ::qsort _LIBCPP_USING_IF_EXISTS;
 using ::abs _LIBCPP_USING_IF_EXISTS;