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 | c96df68ea3d9a3cdf1932772e1ae99ae872005f6 (patch) | |
| tree | db3135beac6764967f250b5538dd796d90c1cabd | |
| parent | 8d794d66bdc2c07c552c31545dd6359bcc258ca6 (diff) | |
| download | cpython-c96df68ea3d9a3cdf1932772e1ae99ae872005f6.zip cpython-c96df68ea3d9a3cdf1932772e1ae99ae872005f6.tar.gz cpython-c96df68ea3d9a3cdf1932772e1ae99ae872005f6.tar.bz2 | |
- dictobject.c: Make dict_merge symbol a static symbol
| -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; |