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

This commit is contained in:
Steve Dower 2018-12-10 20:56:09 -08:00 committed by GitHub
parent 4824385fec
commit d5a6a389d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions

View File

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