diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-05-27 11:30:59 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-27 11:30:59 +0000 |
| commit | 3bd347c543f3849bc5c70f7c07aa02bb204d3060 (patch) | |
| tree | bc488dced2ee95b4311a8c9ee91d62ef36f14248 /Python/dynload_win.c | |
| parent | 687b0bec83d503de3fb95e0515d0ba8519cf0d22 (diff) | |
| parent | 3172ee03da2bfce19a60222fbff5aaf67680d9ea (diff) | |
| download | cpython-3bd347c543f3849bc5c70f7c07aa02bb204d3060.tar.gz | |
Issue #5784: Merge zlib from 3.5
Diffstat (limited to 'Python/dynload_win.c')
| -rw-r--r-- | Python/dynload_win.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index f2c796e94d..05050cf41d 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -24,12 +24,10 @@ void _Py_DeactivateActCtx(ULONG_PTR cookie); #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" +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) "-" PYD_PLATFORM_TAG ".pyd" #else -#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" STRINGIZE(PY_MAJOR_VERSION) STRINGIZE(PY_MINOR_VERSION) ".pyd" +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) ".pyd" #endif #define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd" @@ -43,7 +41,7 @@ const char *_PyImport_DynLoadFiletab[] = { /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ -static int strcasecmp (char *string1, char *string2) +static int strcasecmp (const char *string1, const char *string2) { int first, second; |