diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
| commit | c6180bb73c8c7c7f9d8ea9816487b710597b6fc1 (patch) | |
| tree | fb4a5c18886537b4b7df46ed3b2aa579747ff507 /Parser/parsetok.c | |
| parent | 5e0114a832a903518c4af6983161c0c2a8942a24 (diff) | |
| parent | 819a21a3a4aac38f32e1ba4f68bcef45591fa3f0 (diff) | |
| download | cpython-c6180bb73c8c7c7f9d8ea9816487b710597b6fc1.tar.gz | |
Merge issue #26355 fix from Python 3.5
Diffstat (limited to 'Parser/parsetok.c')
| -rw-r--r-- | Parser/parsetok.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 629dee565c..1f467d63c4 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -161,10 +161,10 @@ PyParser_ParseFileFlagsEx(FILE *fp, const char *filename, #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD #if 0 -static char with_msg[] = +static const char with_msg[] = "%s:%d: Warning: 'with' will become a reserved keyword in Python 2.6\n"; -static char as_msg[] = +static const char as_msg[] = "%s:%d: Warning: 'as' will become a reserved keyword in Python 2.6\n"; static void @@ -255,7 +255,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, #endif if (a >= tok->line_start) col_offset = Py_SAFE_DOWNCAST(a - tok->line_start, - Py_intptr_t, int); + intptr_t, int); else col_offset = -1; |