[Python-checkins] CVS: python/dist/src/PC/os2vacpp config.c,1.5,1.6 getpathp.c,1.7,1.8

Thomas Wouters python-dev@python.org
Sat, 22 Jul 2000 12:25:55 -0700


Update of /cvsroot/python/python/dist/src/PC/os2vacpp
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24717/PC/os2vacpp

Modified Files:
	config.c getpathp.c 
Log Message:

Miscelaneous ANSIfications. I'm assuming here 'main' should take (int,
char**) and return an int even on PC platforms. If not, please fix
PC/utils/makesrc.c ;-P



Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** config.c	2000/06/30 23:58:05	1.5
--- config.c	2000/07/22 19:25:51	1.6
***************
*** 16,54 ****
  #include "Python.h"
  
! extern void initarray();
! extern void initaudioop();
! extern void initbinascii();
! extern void initcmath();
! extern void initerrno();
! extern void initimageop();
! extern void initmath();
! extern void initmd5();
! extern void initnew();
! extern void initnt();
! extern void initos2();
! extern void initoperator();
! extern void initposix();
! extern void initregex();
! extern void initrgbimg();
! extern void initrotor();
! extern void initsignal();
! extern void initselect();
! extern void init_socket();
! extern void initsoundex();
! extern void initstrop();
! extern void initstruct();
! extern void inittime();
! extern void initthread();
! extern void initcStringIO();
! extern void initcPickle();
! extern void initpcre();
  #ifdef WIN32
! extern void initmsvcrt();
  #endif
  
  /* -- ADDMODULE MARKER 1 -- */
  
! extern void PyMarshal_Init();
! extern void initimp();
  
  struct _inittab _PyImport_Inittab[] = {
--- 16,54 ----
  #include "Python.h"
  
! extern void initarray(void);
! extern void initaudioop(void);
! extern void initbinascii(void);
! extern void initcmath(void);
! extern void initerrno(void);
! extern void initimageop(void);
! extern void initmath(void);
! extern void initmd5(void);
! extern void initnew(void);
! extern void initnt(void);
! extern void initos2(void);
! extern void initoperator(void);
! extern void initposix(void);
! extern void initregex(void);
! extern void initrgbimg(void);
! extern void initrotor(void);
! extern void initsignal(void);
! extern void initselect(void);
! extern void init_socket(void);
! extern void initsoundex(void);
! extern void initstrop(void);
! extern void initstruct(void);
! extern void inittime(void);
! extern void initthread(void);
! extern void initcStringIO(void);
! extern void initcPickle(void);
! extern void initpcre(void);
  #ifdef WIN32
! extern void initmsvcrt(void);
  #endif
  
  /* -- ADDMODULE MARKER 1 -- */
  
! extern void PyMarshal_Init(void);
! extern void initimp(void);
  
  struct _inittab _PyImport_Inittab[] = {

Index: getpathp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/getpathp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** getpathp.c	2000/06/30 23:58:05	1.7
--- getpathp.c	2000/07/22 19:25:51	1.8
***************
*** 65,70 ****
  
  static int
! is_sep(ch)	/* determine if "ch" is a separator character */
! 	char ch;
  {
  #ifdef ALTSEP
--- 65,69 ----
  
  static int
! is_sep(char ch)	/* determine if "ch" is a separator character */
  {
  #ifdef ALTSEP
***************
*** 77,82 ****
  
  static void
! reduce(dir)
! 	char *dir;
  {
  	int i = strlen(dir);
--- 76,80 ----
  
  static void
! reduce(char *dir)
  {
  	int i = strlen(dir);
***************
*** 88,93 ****
  
  static int
! exists(filename)
! 	char *filename;
  {
  	struct stat buf;
--- 86,90 ----
  
  static int
! exists(char *filename)
  {
  	struct stat buf;
***************
*** 97,103 ****
  
  static void
! join(buffer, stuff)
! 	char *buffer;
! 	char *stuff;
  {
  	int n, k;
--- 94,98 ----
  
  static void
! join(char *buffer, char *stuff)
  {
  	int n, k;
***************
*** 118,124 ****
  
  static int
! search_for_prefix(argv0_path, landmark)
! 	char *argv0_path;
! 	char *landmark;
  {
  	int n;
--- 113,117 ----
  
  static int
! search_for_prefix(char *argv0_path, char *landmark)
  {
  	int n;
***************
*** 248,252 ****
  
  static void
! get_progpath()
  {
  	extern char *Py_GetProgramName();
--- 241,245 ----
  
  static void
! get_progpath(void)
  {
  	extern char *Py_GetProgramName();
***************
*** 300,304 ****
  
  static void
! calculate_path()
  {
  	char argv0_path[MAXPATHLEN+1];
--- 293,297 ----
  
  static void
! calculate_path(void)
  {
  	char argv0_path[MAXPATHLEN+1];
***************
*** 452,456 ****
  
  char *
! Py_GetPath()
  {
  	if (!module_search_path)
--- 445,449 ----
  
  char *
! Py_GetPath(void)
  {
  	if (!module_search_path)
***************
*** 461,465 ****
  
  char *
! Py_GetPrefix()
  {
  	if (!module_search_path)
--- 454,458 ----
  
  char *
! Py_GetPrefix(void)
  {
  	if (!module_search_path)
***************
*** 470,474 ****
  
  char *
! Py_GetExecPrefix()
  {
  	if (!module_search_path)
--- 463,467 ----
  
  char *
! Py_GetExecPrefix(void)
  {
  	if (!module_search_path)
***************
*** 479,483 ****
  
  char *
! Py_GetProgramFullPath()
  {
  	if (!module_search_path)
--- 472,476 ----
  
  char *
! Py_GetProgramFullPath(void)
  {
  	if (!module_search_path)