| commit | de69ee71e282d89dba5998df29ca53292e8ab035 | [log] [tgz] |
|---|---|---|
| author | doko@ubuntu.com <doko@ubuntu.com> | Tue Oct 11 08:04:02 2016 +0200 |
| committer | doko@ubuntu.com <doko@ubuntu.com> | Tue Oct 11 08:04:02 2016 +0200 |
| tree | 494cc62e8343fcedd82789ce9813af98b6989f61 | |
| parent | 160999779652b8ac5fef8ed6e8d0349829ad0388 [diff] [blame] |
- dictobject.c: Make dict_merge symbol a static symbol
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 164bc18..03c973b 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c
@@ -2372,7 +2372,7 @@ return Py_SAFE_DOWNCAST(i, Py_ssize_t, int); } -int +static int dict_merge(PyObject *a, PyObject *b, int override) { PyDictObject *mp, *other;