From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 11 Dec 2018 05:14:57 +0000 (-0800)
Subject: bpo-34977: Remove unused preprocessor definition (GH-11092)
X-Git-Tag: v3.7.2rc1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb306d586e3f1a48db40bd9519412de4fff3ee8;p=thirdparty%2FPython%2Fcpython.git

bpo-34977: Remove unused preprocessor definition (GH-11092)

(cherry picked from commit d5a6a389d492c5e3d7933bafbd5252fd86ac4d49)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---

diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp
index b015abd59e66..5c8caa6666c4 100644
--- a/PC/python_uwp.cpp
+++ b/PC/python_uwp.cpp
@@ -7,12 +7,8 @@
 #include <Windows.h>
 #include <shellapi.h>
 
-#ifdef PYTHON_UWP_SUPPORTED
 #include <winrt\Windows.ApplicationModel.h>
 #include <winrt\Windows.Storage.h>
-#else
-#include <string>
-#endif
 
 #ifdef PYTHONW
 #ifdef _DEBUG
@@ -31,7 +27,6 @@ const wchar_t *PROGNAME = L"python.exe";
 static void
 set_user_base()
 {
-#ifdef PYTHON_UWP_SUPPORTED
     wchar_t envBuffer[2048];
     try {
         const auto appData = winrt::Windows::Storage::ApplicationData::Current();
@@ -49,17 +44,12 @@ set_user_base()
         }
     } catch (...) {
     }
-#endif
 }
 
 static const wchar_t *
 get_argv0(const wchar_t *argv0)
 {
-#ifdef PYTHON_UWP_SUPPORTED
     winrt::hstring installPath;
-#else
-    std::wstring installPath;
-#endif
     const wchar_t *launcherPath;
     wchar_t *buffer;
     size_t len;
@@ -79,7 +69,6 @@ get_argv0(const wchar_t *argv0)
         return buffer;
     }
 
-#ifdef PYTHON_UWP_SUPPORTED
     try {
         const auto package = winrt::Windows::ApplicationModel::Package::Current();
         if (package) {
@@ -91,7 +80,6 @@ get_argv0(const wchar_t *argv0)
     }
     catch (...) {
     }
-#endif
 
     if (!installPath.empty()) {
         len = installPath.size() + wcslen(PROGNAME) + 2;