[Python-checkins] python/dist/src/PC/os2emx config.c,1.2,1.3

[aimacintyre@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC/os2emx
In directory sc8-pr-cvs1:/tmp/cvs-serv31636

Modified Files:
	config.c 
Log Message:
bring structure closer to std config.c, whitespace normalisation

Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.c	10 Jun 2002 08:04:29 -0000	1.2
--- config.c	2 Jan 2003 12:40:41 -0000	1.3
***************
*** 37,40 ****
--- 37,46 ----
  #include "Python.h"
  
+ extern void initos2();
+ extern void initsignal();
+ #ifdef WITH_THREAD
+ extern void initthread();
+ #endif
+ #if !HAVE_DYNAMIC_LOADING
  extern void init_codecs();
  extern void init_curses();
***************
*** 42,55 ****
  extern void init_hotshot();
  extern void init_locale();
! extern void init_socket();
  extern void init_sre();
  extern void init_testcapi();
  extern void init_weakref();
  extern void initarray();
  extern void initbinascii();
! extern void initbsddb();
  extern void initcPickle();
  extern void initcStringIO();
  extern void initcmath();
  extern void initdl();
  extern void initerrno();
--- 48,64 ----
  extern void init_hotshot();
  extern void init_locale();
! extern void init_random();
  extern void init_sre();
+ extern void init_symtable();
  extern void init_testcapi();
  extern void init_weakref();
  extern void initarray();
  extern void initbinascii();
! extern void initbsddb185();
! extern void initbz2();
  extern void initcPickle();
  extern void initcStringIO();
  extern void initcmath();
+ extern void initdatetime();
  extern void initdl();
  extern void initerrno();
***************
*** 57,66 ****
  extern void initfpectl();
  extern void initfpetest();
- extern void initgc();
  extern void initimageop();
  extern void initmath();
  extern void initmd5();
- extern void initnew();
- extern void initos2();
  extern void initoperator();
  extern void initparser();
--- 66,72 ----
***************
*** 70,80 ****
  extern void initrgbimg();
  extern void initrotor();
- extern void initselect();
  extern void initsha();
- extern void initsignal();
  extern void initstrop();
  extern void initstruct();
  extern void inittermios();
- extern void initthread();
  extern void inittime();
  extern void inittiming();
--- 76,83 ----
***************
*** 82,99 ****
  extern void initxreadlines();
  extern void initxxsubtype();
  extern void initzlib();
! 
  /* -- ADDMODULE MARKER 1 -- */
  
  extern void PyMarshal_Init();
  extern void initimp();
  
  struct _inittab _PyImport_Inittab[] = {
  
! 	{"gc", initgc},
!         {"os2", initos2},
!         {"signal", initsignal},
  #ifdef WITH_THREAD
!         {"thread", initthread},
  #endif
  #if !HAVE_DYNAMIC_LOADING
--- 85,107 ----
  extern void initxreadlines();
  extern void initxxsubtype();
+ extern void initzipimport();
  extern void initzlib();
! #ifdef USE_SOCKET
! extern void init_socket();
! extern void initselect();
! #endif
! #endif
  /* -- ADDMODULE MARKER 1 -- */
  
  extern void PyMarshal_Init();
  extern void initimp();
+ extern void initgc();
  
  struct _inittab _PyImport_Inittab[] = {
  
! 	{"os2", initos2},
! 	{"signal", initsignal},
  #ifdef WITH_THREAD
! 	{"thread", initthread},
  #endif
  #if !HAVE_DYNAMIC_LOADING
***************
*** 103,115 ****
  	{"_hotshot", init_hotshot},
  	{"_locale", init_locale},
!         {"_sre", init_sre},
  	{"_testcapi", init_testcapi},
  	{"_weakref", init_weakref},
  	{"array", initarray},
  	{"binascii", initbinascii},
! 	{"bsddb", initbsddb},
  	{"cPickle", initcPickle},
  	{"cStringIO", initcStringIO},
  	{"cmath", initcmath},
  	{"dl", initdl},
  	{"errno", initerrno},
--- 111,127 ----
  	{"_hotshot", init_hotshot},
  	{"_locale", init_locale},
! 	{"_random", init_random},
! 	{"_sre", init_sre},
! 	{"_symtable", init_symtable},
  	{"_testcapi", init_testcapi},
  	{"_weakref", init_weakref},
  	{"array", initarray},
  	{"binascii", initbinascii},
! 	{"bsddb185", initbsddb185},
! 	{"bz2", initbz2},
  	{"cPickle", initcPickle},
  	{"cStringIO", initcStringIO},
  	{"cmath", initcmath},
+ 	{"datetime", initdatetime},
  	{"dl", initdl},
  	{"errno", initerrno},
***************
*** 120,124 ****
  	{"math", initmath},
  	{"md5", initmd5},
- 	{"new", initnew},
  	{"operator", initoperator},
  	{"parser", initparser},
--- 132,135 ----
***************
*** 137,162 ****
  	{"xreadlines", initxreadlines},
  	{"xxsubtype", initxxsubtype},
  	{"zlib", initzlib},
  #ifdef USE_SOCKET
!         {"_socket", init_socket},
!         {"select", initselect},
  #endif
  #endif
- 
  /* -- ADDMODULE MARKER 2 -- */
  
!         /* This module "lives in" with marshal.c */
!         {"marshal", PyMarshal_Init},
  
!         /* This lives it with import.c */
!         {"imp", initimp},
  
!         /* These entries are here for sys.builtin_module_names */
!         {"__main__", NULL},
!         {"__builtin__", NULL},
!         {"sys", NULL},
!         {"exceptions", NULL},
  
!         /* Sentinel */
!         {0, 0}
  };
--- 148,176 ----
  	{"xreadlines", initxreadlines},
  	{"xxsubtype", initxxsubtype},
+ 	{"zipimport", initzipimport},
  	{"zlib", initzlib},
  #ifdef USE_SOCKET
! 	{"_socket", init_socket},
! 	{"select", initselect},
  #endif
  #endif
  /* -- ADDMODULE MARKER 2 -- */
  
! 	/* This module "lives in" with marshal.c */
! 	{"marshal", PyMarshal_Init},
  
! 	/* This lives it with import.c */
! 	{"imp", initimp},
  
! 	/* These entries are here for sys.builtin_module_names */
! 	{"__main__", NULL},
! 	{"__builtin__", NULL},
! 	{"sys", NULL},
! 	{"exceptions", NULL},
  
! 	/* This lives in gcmodule.c */
! 	{"gc", initgc},
! 
! 	/* Sentinel */
! 	{0, 0}
  };