diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-01-19 09:09:36 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 09:09:36 +1100 |
| commit | 2507e29a9e4e9dcac6eab46546bd3d34a69342ba (patch) | |
| tree | ef70d7947b2af25233400e1496b349caf384a2b4 /PC | |
| parent | fa7880604191f81cbdddc191216f7b1e39a74d8d (diff) | |
| download | cpython-git-2507e29a9e4e9dcac6eab46546bd3d34a69342ba.tar.gz | |
bpo-32588: Move _findvs into its own module and add missing _queue module to installer (#5227)
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/_findvs.cpp | 12 | ||||
| -rw-r--r-- | PC/config.c | 3 |
2 files changed, 4 insertions, 11 deletions
diff --git a/PC/_findvs.cpp b/PC/_findvs.cpp index dd7c1fcb72..ecc68e82e4 100644 --- a/PC/_findvs.cpp +++ b/PC/_findvs.cpp @@ -12,10 +12,6 @@ #include <Windows.h> #include <Strsafe.h> #include "external\include\Setup.Configuration.h" -#pragma comment(lib, "ole32.lib") -#pragma comment(lib, "oleaut32.lib") -#pragma comment(lib, "version.lib") -#pragma comment(lib, "Microsoft.VisualStudio.Setup.Configuration.Native.lib") #include <Python.h> @@ -236,7 +232,7 @@ static int exec_findvs(PyObject *module) return 0; // success } -PyDoc_STRVAR(findvs_doc, "The _findvs helper module"); +PyDoc_STRVAR(findvs_doc, "The _distutils_findvs helper module"); static PyModuleDef_Slot findvs_slots[] = { { Py_mod_exec, exec_findvs }, @@ -245,7 +241,7 @@ static PyModuleDef_Slot findvs_slots[] = { static PyModuleDef findvs_def = { PyModuleDef_HEAD_INIT, - "_findvs", + "_distutils_findvs", findvs_doc, 0, // m_size NULL, // m_methods @@ -256,8 +252,8 @@ static PyModuleDef findvs_def = { }; extern "C" { - PyMODINIT_FUNC PyInit__findvs(void) + PyMODINIT_FUNC PyInit__distutils_findvs(void) { return PyModuleDef_Init(&findvs_def); } -}
\ No newline at end of file +} diff --git a/PC/config.c b/PC/config.c index 699e1d0707..91f15b5867 100644 --- a/PC/config.c +++ b/PC/config.c @@ -69,7 +69,6 @@ extern PyObject* _PyWarnings_Init(void); extern PyObject* PyInit__string(void); extern PyObject* PyInit__stat(void); extern PyObject* PyInit__opcode(void); -extern PyObject* PyInit__findvs(void); /* tools/freeze/makeconfig.py marker for additional "extern" */ /* -- ADDMODULE MARKER 1 -- */ @@ -162,8 +161,6 @@ struct _inittab _PyImport_Inittab[] = { {"_stat", PyInit__stat}, {"_opcode", PyInit__opcode}, - {"_findvs", PyInit__findvs}, - /* Sentinel */ {0, 0} }; |