[Python-checkins] CVS: python/dist/src/PC config.c,1.26,1.27 frozen_dllmain.c,1.1,1.2 getpathp.c,1.17,1.18 winsound.c,1.2,1.3
Thomas Wouters
python-dev@python.org
2000年7月22日 12:25:55 -0700
Update of /cvsroot/python/python/dist/src/PC
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24717/PC
Modified Files:
config.c frozen_dllmain.c getpathp.c winsound.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/config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** config.c 2000年07月12日 12:11:36 1.26
--- config.c 2000年07月22日 19:25:51 1.27
***************
*** 16,61 ****
#include "Python.h"
! extern void initarray();
#ifndef MS_WIN64
! extern void initaudioop();
! extern void initbinascii();
#endif
! extern void initcmath();
! extern void initerrno();
#ifdef WITH_CYCLE_GC
! extern void initgc();
#endif
#ifndef MS_WIN64
! extern void initimageop();
#endif
! extern void initmath();
! extern void initmd5();
! extern void initnew();
! extern void initnt();
! extern void initoperator();
! extern void initregex();
#ifndef MS_WIN64
! extern void initrgbimg();
#endif
! extern void initrotor();
! extern void initsignal();
! extern void initsha();
! 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();
! extern void init_locale();
#endif
! extern void init_codecs();
/* -- ADDMODULE MARKER 1 -- */
! extern void PyMarshal_Init();
! extern void initimp();
struct _inittab _PyImport_Inittab[] = {
--- 16,61 ----
#include "Python.h"
! extern void initarray(void);
#ifndef MS_WIN64
! extern void initaudioop(void);
! extern void initbinascii(void);
#endif
! extern void initcmath(void);
! extern void initerrno(void);
#ifdef WITH_CYCLE_GC
! extern void initgc(void);
#endif
#ifndef MS_WIN64
! extern void initimageop(void);
#endif
! extern void initmath(void);
! extern void initmd5(void);
! extern void initnew(void);
! extern void initnt(void);
! extern void initoperator(void);
! extern void initregex(void);
#ifndef MS_WIN64
! extern void initrgbimg(void);
#endif
! extern void initrotor(void);
! extern void initsignal(void);
! extern void initsha(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);
! extern void init_locale(void);
#endif
! extern void init_codecs(void);
/* -- ADDMODULE MARKER 1 -- */
! extern void PyMarshal_Init(void);
! extern void initimp(void);
struct _inittab _PyImport_Inittab[] = {
Index: frozen_dllmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/frozen_dllmain.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** frozen_dllmain.c 1998年03月20日 17:34:26 1.1
--- frozen_dllmain.c 2000年07月22日 19:25:51 1.2
***************
*** 61,65 ****
modules are initialized correctly
*/
! void PyWinFreeze_ExeInit()
{
char **modName;
--- 61,65 ----
modules are initialized correctly
*/
! void PyWinFreeze_ExeInit(void)
{
char **modName;
***************
*** 74,78 ****
modules are cleaned up
*/
! void PyWinFreeze_ExeTerm()
{
// Must go backwards
--- 74,78 ----
modules are cleaned up
*/
! void PyWinFreeze_ExeTerm(void)
{
// Must go backwards
Index: getpathp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/getpathp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** getpathp.c 2000年06月30日 23:58:05 1.17
--- getpathp.c 2000年07月22日 19:25:51 1.18
***************
*** 99,104 ****
static int
! is_sep(ch) /* determine if "ch" is a separator character */
! char ch;
{
#ifdef ALTSEP
--- 99,103 ----
static int
! is_sep(char ch) /* determine if "ch" is a separator character */
{
#ifdef ALTSEP
***************
*** 111,116 ****
static void
! reduce(dir)
! char *dir;
{
size_t i = strlen(dir);
--- 110,114 ----
static void
! reduce(char *dir)
{
size_t i = strlen(dir);
***************
*** 122,127 ****
static int
! exists(filename)
! char *filename;
{
struct stat buf;
--- 120,124 ----
static int
! exists(char *filename)
{
struct stat buf;
***************
*** 131,136 ****
static int
! ismodule(filename) /* Is module -- check for .pyc/.pyo too */
! char *filename;
{
if (exists(filename))
--- 128,132 ----
static int
! ismodule(char *filename) /* Is module -- check for .pyc/.pyo too */
{
if (exists(filename))
***************
*** 148,154 ****
static void
! join(buffer, stuff)
! char *buffer;
! char *stuff;
{
size_t n, k;
--- 144,148 ----
static void
! join(char *buffer, char *stuff)
{
size_t n, k;
***************
*** 169,174 ****
static int
! gotlandmark(landmark)
! char *landmark;
{
int n, ok;
--- 163,167 ----
static int
! gotlandmark(char *landmark)
{
int n, ok;
***************
*** 183,189 ****
static int
! search_for_prefix(argv0_path, landmark)
! char *argv0_path;
! char *landmark;
{
/* Search from argv0_path, until landmark is found */
--- 176,180 ----
static int
! search_for_prefix(char *argv0_path, char *landmark)
{
/* Search from argv0_path, until landmark is found */
***************
*** 344,348 ****
static void
! get_progpath()
{
extern char *Py_GetProgramName();
--- 335,339 ----
static void
! get_progpath(void)
{
extern char *Py_GetProgramName();
***************
*** 404,408 ****
static void
! calculate_path()
{
char argv0_path[MAXPATHLEN+1];
--- 395,399 ----
static void
! calculate_path(void)
{
char argv0_path[MAXPATHLEN+1];
***************
*** 566,570 ****
char *
! Py_GetPath()
{
if (!module_search_path)
--- 557,561 ----
char *
! Py_GetPath(void)
{
if (!module_search_path)
***************
*** 574,578 ****
char *
! Py_GetPrefix()
{
if (!module_search_path)
--- 565,569 ----
char *
! Py_GetPrefix(void)
{
if (!module_search_path)
***************
*** 582,586 ****
char *
! Py_GetExecPrefix()
{
return Py_GetPrefix();
--- 573,577 ----
char *
! Py_GetExecPrefix(void)
{
return Py_GetPrefix();
***************
*** 588,592 ****
char *
! Py_GetProgramFullPath()
{
if (!module_search_path)
--- 579,583 ----
char *
! Py_GetProgramFullPath(void)
{
if (!module_search_path)
Index: winsound.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/winsound.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** winsound.c 1999年10月01日 14:29:17 1.2
--- winsound.c 2000年07月22日 19:25:51 1.3
***************
*** 141,145 ****
DL_EXPORT(void)
! initwinsound()
{
PyObject *module=Py_InitModule3("winsound", sound_methods, sound_module_doc);
--- 141,145 ----
DL_EXPORT(void)
! initwinsound(void)
{
PyObject *module=Py_InitModule3("winsound", sound_methods, sound_module_doc);