diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /PC/config.c | |
parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
download | cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.zip cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.bz2 |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'PC/config.c')
-rw-r--r-- | PC/config.c | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/PC/config.c b/PC/config.c index 5f58f20..28d02b1 100644 --- a/PC/config.c +++ b/PC/config.c @@ -71,87 +71,87 @@ extern PyObject* PyInit_imp(void); struct _inittab _PyImport_Inittab[] = { - {"array", PyInit_array}, - {"_ast", PyInit__ast}, + {"array", PyInit_array}, + {"_ast", PyInit__ast}, #ifdef MS_WINDOWS #ifndef MS_WINI64 - {"audioop", PyInit_audioop}, + {"audioop", PyInit_audioop}, #endif #endif - {"binascii", PyInit_binascii}, - {"cmath", PyInit_cmath}, - {"errno", PyInit_errno}, - {"gc", PyInit_gc}, - {"math", PyInit_math}, - {"nt", PyInit_nt}, /* Use the NT os functions, not posix */ - {"operator", PyInit_operator}, - {"signal", PyInit_signal}, - {"_md5", PyInit__md5}, - {"_sha1", PyInit__sha1}, - {"_sha256", PyInit__sha256}, - {"_sha512", PyInit__sha512}, - {"time", PyInit_time}, + {"binascii", PyInit_binascii}, + {"cmath", PyInit_cmath}, + {"errno", PyInit_errno}, + {"gc", PyInit_gc}, + {"math", PyInit_math}, + {"nt", PyInit_nt}, /* Use the NT os functions, not posix */ + {"operator", PyInit_operator}, + {"signal", PyInit_signal}, + {"_md5", PyInit__md5}, + {"_sha1", PyInit__sha1}, + {"_sha256", PyInit__sha256}, + {"_sha512", PyInit__sha512}, + {"time", PyInit_time}, #ifdef WITH_THREAD - {"_thread", PyInit__thread}, + {"_thread", PyInit__thread}, #endif #ifdef WIN32 - {"msvcrt", PyInit_msvcrt}, - {"_locale", PyInit__locale}, + {"msvcrt", PyInit_msvcrt}, + {"_locale", PyInit__locale}, #endif - /* XXX Should _subprocess go in a WIN32 block? not WIN64? */ - {"_subprocess", PyInit__subprocess}, - - {"_codecs", PyInit__codecs}, - {"_weakref", PyInit__weakref}, - {"_random", PyInit__random}, - {"_bisect", PyInit__bisect}, - {"_heapq", PyInit__heapq}, - {"_lsprof", PyInit__lsprof}, - {"itertools", PyInit_itertools}, - {"_collections", PyInit__collections}, - {"_symtable", PyInit__symtable}, - {"mmap", PyInit_mmap}, - {"_csv", PyInit__csv}, - {"_sre", PyInit__sre}, - {"parser", PyInit_parser}, - {"winreg", PyInit_winreg}, - {"_struct", PyInit__struct}, - {"datetime", PyInit_datetime}, - {"_functools", PyInit__functools}, - {"_json", PyInit__json}, - - {"xxsubtype", PyInit_xxsubtype}, - {"zipimport", PyInit_zipimport}, - {"zlib", PyInit_zlib}, - - /* CJK codecs */ - {"_multibytecodec", PyInit__multibytecodec}, - {"_codecs_cn", PyInit__codecs_cn}, - {"_codecs_hk", PyInit__codecs_hk}, - {"_codecs_iso2022", PyInit__codecs_iso2022}, - {"_codecs_jp", PyInit__codecs_jp}, - {"_codecs_kr", PyInit__codecs_kr}, - {"_codecs_tw", PyInit__codecs_tw}, + /* XXX Should _subprocess go in a WIN32 block? not WIN64? */ + {"_subprocess", PyInit__subprocess}, + + {"_codecs", PyInit__codecs}, + {"_weakref", PyInit__weakref}, + {"_random", PyInit__random}, + {"_bisect", PyInit__bisect}, + {"_heapq", PyInit__heapq}, + {"_lsprof", PyInit__lsprof}, + {"itertools", PyInit_itertools}, + {"_collections", PyInit__collections}, + {"_symtable", PyInit__symtable}, + {"mmap", PyInit_mmap}, + {"_csv", PyInit__csv}, + {"_sre", PyInit__sre}, + {"parser", PyInit_parser}, + {"winreg", PyInit_winreg}, + {"_struct", PyInit__struct}, + {"datetime", PyInit_datetime}, + {"_functools", PyInit__functools}, + {"_json", PyInit__json}, + + {"xxsubtype", PyInit_xxsubtype}, + {"zipimport", PyInit_zipimport}, + {"zlib", PyInit_zlib}, + + /* CJK codecs */ + {"_multibytecodec", PyInit__multibytecodec}, + {"_codecs_cn", PyInit__codecs_cn}, + {"_codecs_hk", PyInit__codecs_hk}, + {"_codecs_iso2022", PyInit__codecs_iso2022}, + {"_codecs_jp", PyInit__codecs_jp}, + {"_codecs_kr", PyInit__codecs_kr}, + {"_codecs_tw", PyInit__codecs_tw}, /* tools/freeze/makeconfig.py marker for additional "_inittab" entries */ /* -- ADDMODULE MARKER 2 -- */ - /* This module "lives in" with marshal.c */ - {"marshal", PyMarshal_Init}, + /* This module "lives in" with marshal.c */ + {"marshal", PyMarshal_Init}, - /* This lives it with import.c */ - {"imp", PyInit_imp}, + /* This lives it with import.c */ + {"imp", PyInit_imp}, - /* These entries are here for sys.builtin_module_names */ - {"__main__", NULL}, - {"builtins", NULL}, - {"sys", NULL}, - {"_warnings", _PyWarnings_Init}, + /* These entries are here for sys.builtin_module_names */ + {"__main__", NULL}, + {"builtins", NULL}, + {"sys", NULL}, + {"_warnings", _PyWarnings_Init}, - {"_io", PyInit__io}, - {"_pickle", PyInit__pickle}, - {"atexit", PyInit_atexit}, + {"_io", PyInit__io}, + {"_pickle", PyInit__pickle}, + {"atexit", PyInit_atexit}, - /* Sentinel */ - {0, 0} + /* Sentinel */ + {0, 0} }; |