diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2016-10-11 06:04:02 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2016-10-11 06:04:02 (GMT) |
| commit | de69ee71e282d89dba5998df29ca53292e8ab035 (patch) | |
| tree | 494cc62e8343fcedd82789ce9813af98b6989f61 /Objects | |
| parent | 160999779652b8ac5fef8ed6e8d0349829ad0388 (diff) | |
| download | cpython-de69ee71e282d89dba5998df29ca53292e8ab035.zip cpython-de69ee71e282d89dba5998df29ca53292e8ab035.tar.gz cpython-de69ee71e282d89dba5998df29ca53292e8ab035.tar.bz2 | |
- dictobject.c: Make dict_merge symbol a static symbol
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: return Py_SAFE_DOWNCAST(i, Py_ssize_t, int); } -int +static int dict_merge(PyObject *a, PyObject *b, int override) { PyDictObject *mp, *other; |