55
66#include "Python.h"
77
8- extern void initarray (void );
8+ extern PyObject * PyInit_array (void );
99#ifndef MS_WINI64
10- extern void initaudioop (void );
10+ extern PyObject * PyInit_audioop (void );
1111#endif
12- extern void initbinascii (void );
13- extern void initcmath (void );
14- extern void initerrno (void );
15- extern void initgc (void );
16- extern void initmath (void );
17- extern void init_md5 (void );
18- extern void initnt (void );
19- extern void initoperator (void );
20- extern void initsignal (void );
21- extern void init_sha1 (void );
22- extern void init_sha256 (void );
23- extern void init_sha512 (void );
24- extern void inittime (void );
25- extern void init_thread (void );
12+ extern PyObject * PyInit_binascii (void );
13+ extern PyObject * PyInit_cmath (void );
14+ extern PyObject * PyInit_errno (void );
15+ extern PyObject * PyInit_gc (void );
16+ extern PyObject * PyInit_math (void );
17+ extern PyObject * PyInit__md5 (void );
18+ extern PyObject * PyInit_nt (void );
19+ extern PyObject * PyInit_operator (void );
20+ extern PyObject * PyInit_signal (void );
21+ extern PyObject * PyInit__sha1 (void );
22+ extern PyObject * PyInit__sha256 (void );
23+ extern PyObject * PyInit__sha512 (void );
24+ extern PyObject * PyInit_time (void );
25+ extern PyObject * PyInit__thread (void );
26+ extern PyObject * PyInit_cStringIO (void );
2627#ifdef WIN32
27- extern void initmsvcrt (void );
28- extern void init_locale (void );
28+ extern PyObject * PyInit_msvcrt (void );
29+ extern PyObject * PyInit__locale (void );
2930#endif
30- extern void init_codecs (void );
31- extern void init_weakref (void );
32- extern void initxxsubtype (void );
33- extern void initzipimport (void );
34- extern void init_random (void );
35- extern void inititertools (void );
36- extern void init_collections (void );
37- extern void init_heapq (void );
38- extern void init_bisect (void );
39- extern void init_symtable (void );
40- extern void initmmap (void );
41- extern void init_csv (void );
42- extern void init_sre (void );
43- extern void initparser (void );
44- extern void initwinreg (void );
45- extern void init_struct (void );
46- extern void initdatetime (void );
47- extern void init_functools (void );
48- extern void init_json (void );
49- extern void initzlib (void );
50-
51- extern void init_multibytecodec (void );
52- extern void init_codecs_cn (void );
53- extern void init_codecs_hk (void );
54- extern void init_codecs_iso2022 (void );
55- extern void init_codecs_jp (void );
56- extern void init_codecs_kr (void );
57- extern void init_codecs_tw (void );
58- extern void init_subprocess (void );
59- extern void init_lsprof (void );
60- extern void init_ast (void );
61- extern void init_fileio (void );
62- extern void init_bytesio (void );
63- extern void initatexit (void );
64- extern void _PyWarnings_Init (void );
31+ extern PyObject * PyInit__codecs (void );
32+ extern PyObject * PyInit__weakref (void );
33+ extern PyObject * PyInit_xxsubtype (void );
34+ extern PyObject * PyInit_zipimport (void );
35+ extern PyObject * PyInit__random (void );
36+ extern PyObject * PyInit_itertools (void );
37+ extern PyObject * PyInit__collections (void );
38+ extern PyObject * PyInit__heapq (void );
39+ extern PyObject * PyInit__bisect (void );
40+ extern PyObject * PyInit__symtable (void );
41+ extern PyObject * PyInit_mmap (void );
42+ extern PyObject * PyInit__csv (void );
43+ extern PyObject * PyInit__sre (void );
44+ extern PyObject * PyInit_parser (void );
45+ extern PyObject * PyInit_winreg (void );
46+ extern PyObject * PyInit__struct (void );
47+ extern PyObject * PyInit_datetime (void );
48+ extern PyObject * PyInit__functools (void );
49+ extern PyObject * PyInit__json (void );
50+ extern PyObject * PyInit_zlib (void );
51+
52+ extern PyObject * PyInit__multibytecodec (void );
53+ extern PyObject * PyInit__codecs_cn (void );
54+ extern PyObject * PyInit__codecs_hk (void );
55+ extern PyObject * PyInit__codecs_iso2022 (void );
56+ extern PyObject * PyInit__codecs_jp (void );
57+ extern PyObject * PyInit__codecs_kr (void );
58+ extern PyObject * PyInit__codecs_tw (void );
59+ extern PyObject * PyInit__subprocess (void );
60+ extern PyObject * PyInit__lsprof (void );
61+ extern PyObject * PyInit__ast (void );
62+ extern PyObject * PyInit__fileio (void );
63+ extern PyObject * PyInit__bytesio (void );
64+ extern PyObject * PyInit_atexit (void );
65+ extern PyObject * _PyWarnings_Init (void );
6566
6667/* tools/freeze/makeconfig.py marker for additional "extern" */
6768/* -- ADDMODULE MARKER 1 -- */
6869
69- extern void PyMarshal_Init (void );
70- extern void initimp (void );
70+ extern PyObject * PyMarshal_Init (void );
71+ extern PyObject * PyInit_imp (void );
7172
7273struct _inittab _PyImport_Inittab [] = {
7374
74- {"array" , initarray },
75- {"_ast" , init_ast },
75+ {"array" , PyInit_array },
76+ {"_ast" , PyInit__ast },
7677#ifdef MS_WINDOWS
7778#ifndef MS_WINI64
78- {"audioop" , initaudioop },
79+ {"audioop" , PyInit_audioop },
7980#endif
8081#endif
81- {"binascii" , initbinascii },
82- {"cmath" , initcmath },
83- {"errno" , initerrno },
84- {"gc" , initgc },
85- {"math" , initmath },
86- {"nt" , initnt }, /* Use the NT os functions, not posix */
87- {"operator" , initoperator },
88- {"signal" , initsignal },
89- {"_md5" , init_md5 },
90- {"_sha1" , init_sha1 },
91- {"_sha256" , init_sha256 },
92- {"_sha512" , init_sha512 },
93- {"time" , inittime },
82+ {"binascii" , PyInit_binascii },
83+ {"cmath" , PyInit_cmath },
84+ {"errno" , PyInit_errno },
85+ {"gc" , PyInit_gc },
86+ {"math" , PyInit_math },
87+ {"nt" , PyInit_nt }, /* Use the NT os functions, not posix */
88+ {"operator" , PyInit_operator },
89+ {"signal" , PyInit_signal },
90+ {"_md5" , PyInit__md5 },
91+ {"_sha1" , PyInit__sha1 },
92+ {"_sha256" , PyInit__sha256 },
93+ {"_sha512" , PyInit__sha512 },
94+ {"time" , PyInit_time },
9495#ifdef WITH_THREAD
95- {"_thread" , init_thread },
96+ {"_thread" , PyInit__thread },
9697#endif
9798#ifdef WIN32
98- {"msvcrt" , initmsvcrt },
99- {"_locale" , init_locale },
99+ {"msvcrt" , PyInit_msvcrt },
100+ {"_locale" , PyInit__locale },
100101#endif
101102 /* XXX Should _subprocess go in a WIN32 block? not WIN64? */
102- {"_subprocess" , init_subprocess },
103-
104- {"_codecs" , init_codecs },
105- {"_weakref" , init_weakref },
106- {"_random" , init_random },
107- {"_bisect" , init_bisect },
108- {"_heapq" , init_heapq },
109- {"_lsprof" , init_lsprof },
110- {"itertools" , inititertools },
111- {"_collections" , init_collections },
112- {"_symtable" , init_symtable },
113- {"mmap" , initmmap },
114- {"_csv" , init_csv },
115- {"_sre" , init_sre },
116- {"parser" , initparser },
117- {"winreg" , initwinreg },
118- {"_struct" , init_struct },
119- {"datetime" , initdatetime },
120- {"_functools" , init_functools },
121- {"_json" , init_json },
122-
123- {"xxsubtype" , initxxsubtype },
124- {"zipimport" , initzipimport },
125- {"zlib" , initzlib },
103+ {"_subprocess" , PyInit__subprocess },
104+
105+ {"_codecs" , PyInit__codecs },
106+ {"_weakref" , PyInit__weakref },
107+ {"_random" , PyInit__random },
108+ {"_bisect" , PyInit__bisect },
109+ {"_heapq" , PyInit__heapq },
110+ {"_lsprof" , PyInit__lsprof },
111+ {"itertools" , PyInit_itertools },
112+ {"_collections" , PyInit__collections },
113+ {"_symtable" , PyInit__symtable },
114+ {"mmap" , PyInit_mmap },
115+ {"_csv" , PyInit__csv },
116+ {"_sre" , PyInit__sre },
117+ {"parser" , PyInit_parser },
118+ {"winreg" , PyInit_winreg },
119+ {"_struct" , PyInit__struct },
120+ {"datetime" , PyInit_datetime },
121+ {"_functools" , PyInit__functools },
122+ {"_json" , PyInit__json },
123+
124+ {"xxsubtype" , PyInit_xxsubtype },
125+ {"zipimport" , PyInit_zipimport },
126+ {"zlib" , PyInit_zlib },
126127
127128 /* CJK codecs */
128- {"_multibytecodec" , init_multibytecodec },
129- {"_codecs_cn" , init_codecs_cn },
130- {"_codecs_hk" , init_codecs_hk },
131- {"_codecs_iso2022" , init_codecs_iso2022 },
132- {"_codecs_jp" , init_codecs_jp },
133- {"_codecs_kr" , init_codecs_kr },
134- {"_codecs_tw" , init_codecs_tw },
129+ {"_multibytecodec" , PyInit__multibytecodec },
130+ {"_codecs_cn" , PyInit__codecs_cn },
131+ {"_codecs_hk" , PyInit__codecs_hk },
132+ {"_codecs_iso2022" , PyInit__codecs_iso2022 },
133+ {"_codecs_jp" , PyInit__codecs_jp },
134+ {"_codecs_kr" , PyInit__codecs_kr },
135+ {"_codecs_tw" , PyInit__codecs_tw },
135136
136137/* tools/freeze/makeconfig.py marker for additional "_inittab" entries */
137138/* -- ADDMODULE MARKER 2 -- */
@@ -140,17 +141,17 @@ struct _inittab _PyImport_Inittab[] = {
140141 {"marshal" , PyMarshal_Init },
141142
142143 /* This lives it with import.c */
143- {"imp" , initimp },
144+ {"imp" , PyInit_imp },
144145
145146 /* These entries are here for sys.builtin_module_names */
146147 {"__main__" , NULL },
147148 {"builtins" , NULL },
148149 {"sys" , NULL },
149150 {"_warnings" , _PyWarnings_Init },
150151
151- {"_fileio" , init_fileio },
152- {"_bytesio" , init_bytesio },
153- {"atexit" , initatexit },
152+ {"_fileio" , PyInit__fileio },
153+ {"_bytesio" , PyInit__bytesio },
154+ {"atexit" , PyInit_atexit },
154155
155156 /* Sentinel */
156157 {0 , 0 }
0 commit comments