Skip to content

[3.7] bpo-34977: Remove unused preprocessor definition (GH-11092) #11093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Dec 11, 2018
Merged

[3.7] bpo-34977: Remove unused preprocessor definition (GH-11092) #11093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions PC/python_uwp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
Expand All @@ -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;
Expand All @@ -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) {
Expand All @@ -91,7 +80,6 @@ get_argv0(const wchar_t *argv0)
}
catch (...) {
}
#endif

if (!installPath.empty()) {
len = installPath.size() + wcslen(PROGNAME) + 2;
Expand Down