mirror of
https://github.com/python/cpython.git
synced 2025-07-08 03:45:36 +00:00
gh-106560: Fix redundant declarations in Python/frozen.c (#112612)
Avoid duplicated declarations of "extern" functions in
Python/frozen.c.
Compiler warnings seen by building Python with gcc -Wredundant-decls.
(cherry picked from commit d9e444dbb8
)
This commit is contained in:
parent
05f5d416de
commit
34d57d5871
2 changed files with 12 additions and 7 deletions
|
@ -80,7 +80,6 @@ extern PyObject *_Py_get__sitebuiltins_toplevel(void);
|
||||||
extern PyObject *_Py_get_genericpath_toplevel(void);
|
extern PyObject *_Py_get_genericpath_toplevel(void);
|
||||||
extern PyObject *_Py_get_ntpath_toplevel(void);
|
extern PyObject *_Py_get_ntpath_toplevel(void);
|
||||||
extern PyObject *_Py_get_posixpath_toplevel(void);
|
extern PyObject *_Py_get_posixpath_toplevel(void);
|
||||||
extern PyObject *_Py_get_posixpath_toplevel(void);
|
|
||||||
extern PyObject *_Py_get_os_toplevel(void);
|
extern PyObject *_Py_get_os_toplevel(void);
|
||||||
extern PyObject *_Py_get_site_toplevel(void);
|
extern PyObject *_Py_get_site_toplevel(void);
|
||||||
extern PyObject *_Py_get_stat_toplevel(void);
|
extern PyObject *_Py_get_stat_toplevel(void);
|
||||||
|
@ -88,12 +87,7 @@ extern PyObject *_Py_get_importlib_util_toplevel(void);
|
||||||
extern PyObject *_Py_get_importlib_machinery_toplevel(void);
|
extern PyObject *_Py_get_importlib_machinery_toplevel(void);
|
||||||
extern PyObject *_Py_get_runpy_toplevel(void);
|
extern PyObject *_Py_get_runpy_toplevel(void);
|
||||||
extern PyObject *_Py_get___hello___toplevel(void);
|
extern PyObject *_Py_get___hello___toplevel(void);
|
||||||
extern PyObject *_Py_get___hello___toplevel(void);
|
|
||||||
extern PyObject *_Py_get___hello___toplevel(void);
|
|
||||||
extern PyObject *_Py_get___hello___toplevel(void);
|
|
||||||
extern PyObject *_Py_get___phello___toplevel(void);
|
extern PyObject *_Py_get___phello___toplevel(void);
|
||||||
extern PyObject *_Py_get___phello___toplevel(void);
|
|
||||||
extern PyObject *_Py_get___phello___ham_toplevel(void);
|
|
||||||
extern PyObject *_Py_get___phello___ham_toplevel(void);
|
extern PyObject *_Py_get___phello___ham_toplevel(void);
|
||||||
extern PyObject *_Py_get___phello___ham_eggs_toplevel(void);
|
extern PyObject *_Py_get___phello___ham_eggs_toplevel(void);
|
||||||
extern PyObject *_Py_get___phello___spam_toplevel(void);
|
extern PyObject *_Py_get___phello___spam_toplevel(void);
|
||||||
|
|
|
@ -467,6 +467,17 @@ def replace_block(lines, start_marker, end_marker, replacements, file):
|
||||||
return lines[:start_pos + 1] + replacements + lines[end_pos:]
|
return lines[:start_pos + 1] + replacements + lines[end_pos:]
|
||||||
|
|
||||||
|
|
||||||
|
class UniqueList(list):
|
||||||
|
def __init__(self):
|
||||||
|
self._seen = set()
|
||||||
|
|
||||||
|
def append(self, item):
|
||||||
|
if item in self._seen:
|
||||||
|
return
|
||||||
|
super().append(item)
|
||||||
|
self._seen.add(item)
|
||||||
|
|
||||||
|
|
||||||
def regen_frozen(modules, frozen_modules: bool):
|
def regen_frozen(modules, frozen_modules: bool):
|
||||||
headerlines = []
|
headerlines = []
|
||||||
parentdir = os.path.dirname(FROZEN_FILE)
|
parentdir = os.path.dirname(FROZEN_FILE)
|
||||||
|
@ -477,7 +488,7 @@ def regen_frozen(modules, frozen_modules: bool):
|
||||||
header = relpath_for_posix_display(src.frozenfile, parentdir)
|
header = relpath_for_posix_display(src.frozenfile, parentdir)
|
||||||
headerlines.append(f'#include "{header}"')
|
headerlines.append(f'#include "{header}"')
|
||||||
|
|
||||||
externlines = []
|
externlines = UniqueList()
|
||||||
bootstraplines = []
|
bootstraplines = []
|
||||||
stdliblines = []
|
stdliblines = []
|
||||||
testlines = []
|
testlines = []
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue