diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-05-28 01:07:08 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-28 01:07:08 +0000 |
| commit | 30a919d162fc7f5072de7fecde86da3d9b43d3e8 (patch) | |
| tree | 32f34d92e32755208fab34fcc543a8996b0039d3 /Python/dynload_win.c | |
| parent | f04b85e6c166e9f31aa167d63e92c49595c858d6 (diff) | |
| parent | 1f1268c0bc93629b7abc16d8af9cf997c32a947b (diff) | |
| download | cpython-30a919d162fc7f5072de7fecde86da3d9b43d3e8.tar.gz | |
Issue #20699: Merge io bytes-like fixes 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; |