From: doko@ubuntu.com <doko@ubuntu.com>
Date: Tue, 11 Oct 2016 06:04:02 +0000 (+0200)
Subject:  - dictobject.c: Make dict_merge symbol a static symbol
X-Git-Tag: v3.6.0b3~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de69ee71e282d89dba5998df29ca53292e8ab035;p=thirdparty%2FPython%2Fcpython.git

 - dictobject.c: Make dict_merge symbol a static symbol
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 164bc180aa3f..03c973be636a 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;