Commit c1b94e32 authored by Guido van Rossum's avatar Guido van Rossum

rearranged modules alphabetically

parent 5208e1da
...@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Configurable Python configuration file */ /* Configurable Python configuration file */
#include "PROTO.h" #include "PROTO.h"
#include "malloc.h" #include "mymalloc.h"
#include "patchlevel.h" #include "patchlevel.h"
...@@ -115,14 +115,14 @@ getpythonpath() ...@@ -115,14 +115,14 @@ getpythonpath()
These are initialized when first imported. */ These are initialized when first imported. */
/* Standard modules */ /* Standard modules */
extern void inittime(); extern void initgrp();
extern void initmarshal();
extern void initmath(); extern void initmath();
extern void initposix(); extern void initposix();
extern void initpwd(); extern void initpwd();
extern void initgrp();
extern void initmarshal();
extern void initselect(); extern void initselect();
extern void initsocket(); extern void initsocket();
extern void inittime();
#ifdef USE_AUDIO #ifdef USE_AUDIO
extern void initaudio(); extern void initaudio();
...@@ -133,35 +133,38 @@ extern void inital(); ...@@ -133,35 +133,38 @@ extern void inital();
#ifdef USE_AMOEBA #ifdef USE_AMOEBA
extern void initamoeba(); extern void initamoeba();
#endif #endif
#ifdef USE_GL #ifdef USE_CD
extern void initgl(); extern void initcd();
#ifdef USE_FM #endif
extern void initfm();
#ifdef USE_FL #ifdef USE_FL
extern void initfl(); extern void initfl();
#endif #endif
#ifdef USE_FM
extern void initfm();
#endif
#ifdef USE_GL
extern void initgl();
#endif
#ifdef USE_JPEG
extern void initjpeg();
#endif
#ifdef USE_NIS
extern void initnis();
#endif #endif
#ifdef USE_PANEL #ifdef USE_PANEL
extern void initpanel(); extern void initpanel();
#endif #endif
#endif
#ifdef USE_REGEX #ifdef USE_REGEX
extern void initregex(); extern void initregex();
#endif #endif
#ifdef USE_STDWIN #ifdef USE_STDWIN
extern void initstdwin(); extern void initstdwin();
#endif #endif
#ifdef USE_JPEG
extern void initjpeg();
#endif
#ifdef USE_CD
extern void initcd();
#endif
#ifdef USE_THREAD #ifdef USE_THREAD
extern void initthread(); extern void initthread();
#endif #endif
#ifdef USE_NIS #ifdef USE_SV
extern void initnis(); extern void initsv();
#endif #endif
struct { struct {
...@@ -169,19 +172,18 @@ struct { ...@@ -169,19 +172,18 @@ struct {
void (*initfunc)(); void (*initfunc)();
} inittab[] = { } inittab[] = {
/* Standard modules */ /* Standard modules, in alphabetical order */
{"time", inittime}, {"grp", initgrp},
{"marshal", initmarshal},
{"math", initmath}, {"math", initmath},
{"posix", initposix}, {"posix", initposix},
{"pwd", initpwd}, {"pwd", initpwd},
{"grp", initgrp},
{"marshal", initmarshal},
{"select", initselect}, {"select", initselect},
{"socket", initsocket}, {"socket", initsocket},
{"time", inittime},
/* Optional modules, in alphabetical order */
/* Optional modules */
#ifdef USE_AUDIO #ifdef USE_AUDIO
{"audio", initaudio}, {"audio", initaudio},
...@@ -195,18 +197,33 @@ struct { ...@@ -195,18 +197,33 @@ struct {
{"amoeba", initamoeba}, {"amoeba", initamoeba},
#endif #endif
#ifdef USE_GL #ifdef USE_CD
{"gl", initgl}, {"cd", initcd},
#ifdef USE_FM #endif
{"fm", initfm},
#ifdef USE_FL #ifdef USE_FL
{"fl", initfl}, {"fl", initfl},
#endif #endif
#ifdef USE_FM
{"fm", initfm},
#endif #endif
#ifdef USE_GL
{"gl", initgl},
#endif
#ifdef USE_JPEG
{"jpeg", initjpeg},
#endif
#ifdef USE_NIS
{"nis", initnis},
#endif
#ifdef USE_PANEL #ifdef USE_PANEL
{"pnl", initpanel}, {"pnl", initpanel},
#endif #endif
#endif
#ifdef USE_REGEX #ifdef USE_REGEX
{"regex", initregex}, {"regex", initregex},
...@@ -216,20 +233,12 @@ struct { ...@@ -216,20 +233,12 @@ struct {
{"stdwin", initstdwin}, {"stdwin", initstdwin},
#endif #endif
#ifdef USE_JPEG
{"jpeg", initjpeg},
#endif
#ifdef USE_CD
{"cd", initcd},
#endif
#ifdef USE_THREAD #ifdef USE_THREAD
{"thread", initthread}, {"thread", initthread},
#endif #endif
#ifdef USE_NIS #ifdef USE_SV
{"nis", initnis}, {"sv", initsv},
#endif #endif
{0, 0} /* Sentinel */ {0, 0} /* Sentinel */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment