diff options
| author | Gregory P. Smith <greg@krypto.org> | 2015-01-22 22:56:06 -0800 |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2015-01-22 22:56:06 -0800 |
| commit | 8d0474182b3c0dba017357ed7e3a7d6b5a0e05cb (patch) | |
| tree | 5635e9e954272393a993fdaa3cf563e91f86f383 /Python/dynload_win.c | |
| parent | 52d4e1bd942e0dd6209c9e60b3f3cc98eea14b90 (diff) | |
| parent | 07a465b24e1fc5e4804e536312c917017d0b663e (diff) | |
| download | cpython-8d0474182b3c0dba017357ed7e3a7d6b5a0e05cb.tar.gz | |
revert 7b833bd1f509. I misread the side effect that the code was triggering.
*any* kwarg supplied to _assert_python causes it to not append -E to the
command line flags so without='-E' does effectively work.
Diffstat (limited to 'Python/dynload_win.c')
| -rw-r--r-- | Python/dynload_win.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index ffcf0ee1d7..9ed9eea333 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -9,6 +9,7 @@ #include <ctype.h> #include "importdl.h" +#include "patchlevel.h" #include <windows.h> // "activation context" magic - see dl_nt.c... @@ -17,16 +18,28 @@ extern ULONG_PTR _Py_ActivateActCtx(); void _Py_DeactivateActCtx(ULONG_PTR cookie); #endif -const char *_PyImport_DynLoadFiletab[] = { #ifdef _DEBUG - "_d.pyd", +#define PYD_DEBUG_SUFFIX "_d" +#else +#define PYD_DEBUG_SUFFIX "" +#endif + +#define STRINGIZE2(x) #x +#define STRINGIZE(x) STRINGIZE2(x) +#ifdef PYD_PLATFORM_TAG +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" STRINGIZE(PY_MAJOR_VERSION) STRINGIZE(PY_MINOR_VERSION) "-" PYD_PLATFORM_TAG ".pyd" #else - ".pyd", +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" STRINGIZE(PY_MAJOR_VERSION) STRINGIZE(PY_MINOR_VERSION) ".pyd" #endif + +#define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd" + +const char *_PyImport_DynLoadFiletab[] = { + PYD_TAGGED_SUFFIX, + PYD_UNTAGGED_SUFFIX, NULL }; - /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ |