File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2525/* Configurable Python configuration file */
2626
2727#include "PROTO.h"
28- #include "malloc .h"
28+ #include "mymalloc .h"
2929
3030#include "patchlevel.h"
3131
@@ -115,14 +115,14 @@ getpythonpath()
115115 These are initialized when first imported. */
116116
117117/* Standard modules */
118- extern void inittime();
118+ extern void initgrp();
119+ extern void initmarshal();
119120extern void initmath();
120121extern void initposix();
121122extern void initpwd();
122- extern void initgrp();
123- extern void initmarshal();
124123extern void initselect();
125124extern void initsocket();
125+ extern void inittime();
126126
127127#ifdef USE_AUDIO
128128extern void initaudio();
@@ -133,55 +133,57 @@ extern void inital();
133133#ifdef USE_AMOEBA
134134extern void initamoeba();
135135#endif
136- #ifdef USE_GL
137- extern void initgl();
138- #ifdef USE_FM
139- extern void initfm();
136+ #ifdef USE_CD
137+ extern void initcd();
138+ #endif
140139#ifdef USE_FL
141140extern void initfl();
142141#endif
142+ #ifdef USE_FM
143+ extern void initfm();
144+ #endif
145+ #ifdef USE_GL
146+ extern void initgl();
147+ #endif
148+ #ifdef USE_JPEG
149+ extern void initjpeg();
150+ #endif
151+ #ifdef USE_NIS
152+ extern void initnis();
143153#endif
144154#ifdef USE_PANEL
145155extern void initpanel();
146156#endif
147- #endif
148157#ifdef USE_REGEX
149158extern void initregex();
150159#endif
151160#ifdef USE_STDWIN
152161extern void initstdwin();
153162#endif
154- #ifdef USE_JPEG
155- extern void initjpeg();
156- #endif
157- #ifdef USE_CD
158- extern void initcd();
159- #endif
160163#ifdef USE_THREAD
161164extern void initthread();
162165#endif
163- #ifdef USE_NIS
164- extern void initnis ();
166+ #ifdef USE_SV
167+ extern void initsv ();
165168#endif
166169
167170struct {
168171 char *name;
169172 void (*initfunc)();
170173} inittab[] = {
171174
172- /* Standard modules */
175+ /* Standard modules, in alphabetical order */
173176
174- {"time", inittime},
177+ {"grp", initgrp},
178+ {"marshal", initmarshal},
175179 {"math", initmath},
176180 {"posix", initposix},
177181 {"pwd", initpwd},
178- {"grp", initgrp},
179- {"marshal", initmarshal},
180182 {"select", initselect},
181183 {"socket", initsocket},
184+ {"time", inittime},
182185
183-
184- /* Optional modules */
186+ /* Optional modules, in alphabetical order */
185187
186188#ifdef USE_AUDIO
187189 {"audio", initaudio},
@@ -195,18 +197,33 @@ struct {
195197 {"amoeba", initamoeba},
196198#endif
197199
198- #ifdef USE_GL
199- {"gl ", initgl },
200- #ifdef USE_FM
201- {"fm", initfm},
200+ #ifdef USE_CD
201+ {"cd ", initcd },
202+ #endif
203+
202204#ifdef USE_FL
203205 {"fl", initfl},
204206#endif
207+
208+ #ifdef USE_FM
209+ {"fm", initfm},
205210#endif
211+
212+ #ifdef USE_GL
213+ {"gl", initgl},
214+ #endif
215+
216+ #ifdef USE_JPEG
217+ {"jpeg", initjpeg},
218+ #endif
219+
220+ #ifdef USE_NIS
221+ {"nis", initnis},
222+ #endif
223+
206224#ifdef USE_PANEL
207225 {"pnl", initpanel},
208226#endif
209- #endif
210227
211228#ifdef USE_REGEX
212229 {"regex", initregex},
@@ -216,20 +233,12 @@ struct {
216233 {"stdwin", initstdwin},
217234#endif
218235
219- #ifdef USE_JPEG
220- {"jpeg", initjpeg},
221- #endif
222-
223- #ifdef USE_CD
224- {"cd", initcd},
225- #endif
226-
227236#ifdef USE_THREAD
228237 {"thread", initthread},
229238#endif
230239
231- #ifdef USE_NIS
232- {"nis ", initnis },
240+ #ifdef USE_SV
241+ {"sv ", initsv },
233242#endif
234243
235244 {0, 0} /* Sentinel */
You can’t perform that action at this time.
0 commit comments