Update to PEP 3121.

This commit is contained in:
Martin v. Löwis 2008-06-11 05:48:29 +00:00
parent 3447bee9cc
commit 6a880a8313
1 changed files with 107 additions and 106 deletions

View File

@ -5,133 +5,134 @@
#include "Python.h" #include "Python.h"
extern void initarray(void); extern PyObject* PyInit_array(void);
#ifndef MS_WINI64 #ifndef MS_WINI64
extern void initaudioop(void); extern PyObject* PyInit_audioop(void);
#endif #endif
extern void initbinascii(void); extern PyObject* PyInit_binascii(void);
extern void initcmath(void); extern PyObject* PyInit_cmath(void);
extern void initerrno(void); extern PyObject* PyInit_errno(void);
extern void initgc(void); extern PyObject* PyInit_gc(void);
extern void initmath(void); extern PyObject* PyInit_math(void);
extern void init_md5(void); extern PyObject* PyInit__md5(void);
extern void initnt(void); extern PyObject* PyInit_nt(void);
extern void initoperator(void); extern PyObject* PyInit_operator(void);
extern void initsignal(void); extern PyObject* PyInit_signal(void);
extern void init_sha1(void); extern PyObject* PyInit__sha1(void);
extern void init_sha256(void); extern PyObject* PyInit__sha256(void);
extern void init_sha512(void); extern PyObject* PyInit__sha512(void);
extern void inittime(void); extern PyObject* PyInit_time(void);
extern void init_thread(void); extern PyObject* PyInit__thread(void);
extern PyObject* PyInit_cStringIO(void);
#ifdef WIN32 #ifdef WIN32
extern void initmsvcrt(void); extern PyObject* PyInit_msvcrt(void);
extern void init_locale(void); extern PyObject* PyInit__locale(void);
#endif #endif
extern void init_codecs(void); extern PyObject* PyInit__codecs(void);
extern void init_weakref(void); extern PyObject* PyInit__weakref(void);
extern void initxxsubtype(void); extern PyObject* PyInit_xxsubtype(void);
extern void initzipimport(void); extern PyObject* PyInit_zipimport(void);
extern void init_random(void); extern PyObject* PyInit__random(void);
extern void inititertools(void); extern PyObject* PyInit_itertools(void);
extern void init_collections(void); extern PyObject* PyInit__collections(void);
extern void init_heapq(void); extern PyObject* PyInit__heapq(void);
extern void init_bisect(void); extern PyObject* PyInit__bisect(void);
extern void init_symtable(void); extern PyObject* PyInit__symtable(void);
extern void initmmap(void); extern PyObject* PyInit_mmap(void);
extern void init_csv(void); extern PyObject* PyInit__csv(void);
extern void init_sre(void); extern PyObject* PyInit__sre(void);
extern void initparser(void); extern PyObject* PyInit_parser(void);
extern void initwinreg(void); extern PyObject* PyInit_winreg(void);
extern void init_struct(void); extern PyObject* PyInit__struct(void);
extern void initdatetime(void); extern PyObject* PyInit_datetime(void);
extern void init_functools(void); extern PyObject* PyInit__functools(void);
extern void init_json(void); extern PyObject* PyInit__json(void);
extern void initzlib(void); extern PyObject* PyInit_zlib(void);
extern void init_multibytecodec(void); extern PyObject* PyInit__multibytecodec(void);
extern void init_codecs_cn(void); extern PyObject* PyInit__codecs_cn(void);
extern void init_codecs_hk(void); extern PyObject* PyInit__codecs_hk(void);
extern void init_codecs_iso2022(void); extern PyObject* PyInit__codecs_iso2022(void);
extern void init_codecs_jp(void); extern PyObject* PyInit__codecs_jp(void);
extern void init_codecs_kr(void); extern PyObject* PyInit__codecs_kr(void);
extern void init_codecs_tw(void); extern PyObject* PyInit__codecs_tw(void);
extern void init_subprocess(void); extern PyObject* PyInit__subprocess(void);
extern void init_lsprof(void); extern PyObject* PyInit__lsprof(void);
extern void init_ast(void); extern PyObject* PyInit__ast(void);
extern void init_fileio(void); extern PyObject* PyInit__fileio(void);
extern void init_bytesio(void); extern PyObject* PyInit__bytesio(void);
extern void initatexit(void); extern PyObject* PyInit_atexit(void);
extern void _PyWarnings_Init(void); extern PyObject* _PyWarnings_Init(void);
/* tools/freeze/makeconfig.py marker for additional "extern" */ /* tools/freeze/makeconfig.py marker for additional "extern" */
/* -- ADDMODULE MARKER 1 -- */ /* -- ADDMODULE MARKER 1 -- */
extern void PyMarshal_Init(void); extern PyObject* PyMarshal_Init(void);
extern void initimp(void); extern PyObject* PyInit_imp(void);
struct _inittab _PyImport_Inittab[] = { struct _inittab _PyImport_Inittab[] = {
{"array", initarray}, {"array", PyInit_array},
{"_ast", init_ast}, {"_ast", PyInit__ast},
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
#ifndef MS_WINI64 #ifndef MS_WINI64
{"audioop", initaudioop}, {"audioop", PyInit_audioop},
#endif #endif
#endif #endif
{"binascii", initbinascii}, {"binascii", PyInit_binascii},
{"cmath", initcmath}, {"cmath", PyInit_cmath},
{"errno", initerrno}, {"errno", PyInit_errno},
{"gc", initgc}, {"gc", PyInit_gc},
{"math", initmath}, {"math", PyInit_math},
{"nt", initnt}, /* Use the NT os functions, not posix */ {"nt", PyInit_nt}, /* Use the NT os functions, not posix */
{"operator", initoperator}, {"operator", PyInit_operator},
{"signal", initsignal}, {"signal", PyInit_signal},
{"_md5", init_md5}, {"_md5", PyInit__md5},
{"_sha1", init_sha1}, {"_sha1", PyInit__sha1},
{"_sha256", init_sha256}, {"_sha256", PyInit__sha256},
{"_sha512", init_sha512}, {"_sha512", PyInit__sha512},
{"time", inittime}, {"time", PyInit_time},
#ifdef WITH_THREAD #ifdef WITH_THREAD
{"_thread", init_thread}, {"_thread", PyInit__thread},
#endif #endif
#ifdef WIN32 #ifdef WIN32
{"msvcrt", initmsvcrt}, {"msvcrt", PyInit_msvcrt},
{"_locale", init_locale}, {"_locale", PyInit__locale},
#endif #endif
/* XXX Should _subprocess go in a WIN32 block? not WIN64? */ /* XXX Should _subprocess go in a WIN32 block? not WIN64? */
{"_subprocess", init_subprocess}, {"_subprocess", PyInit__subprocess},
{"_codecs", init_codecs}, {"_codecs", PyInit__codecs},
{"_weakref", init_weakref}, {"_weakref", PyInit__weakref},
{"_random", init_random}, {"_random", PyInit__random},
{"_bisect", init_bisect}, {"_bisect", PyInit__bisect},
{"_heapq", init_heapq}, {"_heapq", PyInit__heapq},
{"_lsprof", init_lsprof}, {"_lsprof", PyInit__lsprof},
{"itertools", inititertools}, {"itertools", PyInit_itertools},
{"_collections", init_collections}, {"_collections", PyInit__collections},
{"_symtable", init_symtable}, {"_symtable", PyInit__symtable},
{"mmap", initmmap}, {"mmap", PyInit_mmap},
{"_csv", init_csv}, {"_csv", PyInit__csv},
{"_sre", init_sre}, {"_sre", PyInit__sre},
{"parser", initparser}, {"parser", PyInit_parser},
{"winreg", initwinreg}, {"winreg", PyInit_winreg},
{"_struct", init_struct}, {"_struct", PyInit__struct},
{"datetime", initdatetime}, {"datetime", PyInit_datetime},
{"_functools", init_functools}, {"_functools", PyInit__functools},
{"_json", init_json}, {"_json", PyInit__json},
{"xxsubtype", initxxsubtype}, {"xxsubtype", PyInit_xxsubtype},
{"zipimport", initzipimport}, {"zipimport", PyInit_zipimport},
{"zlib", initzlib}, {"zlib", PyInit_zlib},
/* CJK codecs */ /* CJK codecs */
{"_multibytecodec", init_multibytecodec}, {"_multibytecodec", PyInit__multibytecodec},
{"_codecs_cn", init_codecs_cn}, {"_codecs_cn", PyInit__codecs_cn},
{"_codecs_hk", init_codecs_hk}, {"_codecs_hk", PyInit__codecs_hk},
{"_codecs_iso2022", init_codecs_iso2022}, {"_codecs_iso2022", PyInit__codecs_iso2022},
{"_codecs_jp", init_codecs_jp}, {"_codecs_jp", PyInit__codecs_jp},
{"_codecs_kr", init_codecs_kr}, {"_codecs_kr", PyInit__codecs_kr},
{"_codecs_tw", init_codecs_tw}, {"_codecs_tw", PyInit__codecs_tw},
/* tools/freeze/makeconfig.py marker for additional "_inittab" entries */ /* tools/freeze/makeconfig.py marker for additional "_inittab" entries */
/* -- ADDMODULE MARKER 2 -- */ /* -- ADDMODULE MARKER 2 -- */
@ -140,7 +141,7 @@ struct _inittab _PyImport_Inittab[] = {
{"marshal", PyMarshal_Init}, {"marshal", PyMarshal_Init},
/* This lives it with import.c */ /* This lives it with import.c */
{"imp", initimp}, {"imp", PyInit_imp},
/* These entries are here for sys.builtin_module_names */ /* These entries are here for sys.builtin_module_names */
{"__main__", NULL}, {"__main__", NULL},
@ -148,9 +149,9 @@ struct _inittab _PyImport_Inittab[] = {
{"sys", NULL}, {"sys", NULL},
{"_warnings", _PyWarnings_Init}, {"_warnings", _PyWarnings_Init},
{"_fileio", init_fileio}, {"_fileio", PyInit__fileio},
{"_bytesio", init_bytesio}, {"_bytesio", PyInit__bytesio},
{"atexit", initatexit}, {"atexit", PyInit_atexit},
/* Sentinel */ /* Sentinel */
{0, 0} {0, 0}