Merged revisions 81602 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81602 | mark.dickinson | 2010-05-29 22:00:52 +0100 (Sat, 29 May 2010) | 1 line

  Untabify Modules/config.c.in.
........
This commit is contained in:
Mark Dickinson 2010-05-29 21:05:27 +00:00
parent a119393dc4
commit 57bd2bae9c

View file

@ -34,28 +34,28 @@ struct _inittab _PyImport_Inittab[] = {
/* -- ADDMODULE MARKER 2 -- */ /* -- ADDMODULE MARKER 2 -- */
/* This module lives in marshal.c */ /* This module lives in marshal.c */
{"marshal", PyMarshal_Init}, {"marshal", PyMarshal_Init},
/* This lives in import.c */ /* This lives in import.c */
{"imp", PyInit_imp}, {"imp", PyInit_imp},
/* This lives in Python/Python-ast.c */ /* This lives in Python/Python-ast.c */
{"_ast", PyInit__ast}, {"_ast", PyInit__ast},
/* These entries are here for sys.builtin_module_names */ /* These entries are here for sys.builtin_module_names */
{"__main__", NULL}, {"__main__", NULL},
{"builtins", NULL}, {"builtins", NULL},
{"sys", NULL}, {"sys", NULL},
/* This lives in gcmodule.c */ /* This lives in gcmodule.c */
{"gc", PyInit_gc}, {"gc", PyInit_gc},
/* This lives in _warnings.c */ /* This lives in _warnings.c */
{"_warnings", _PyWarnings_Init}, {"_warnings", _PyWarnings_Init},
/* Sentinel */ /* Sentinel */
{0, 0} {0, 0}
}; };