[Python-checkins] CVS: python/dist/src/Python ceval.c,2.183,2.184 import.c,2.140,2.141 pythonrun.c,2.102,2.103

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Python
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21949

Modified Files:
	ceval.c import.c pythonrun.c 
Log Message:
Include macglue.h for some function prototypes, and renamed a few
mac-specific functions to have a PyMac_ name.


Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.183
retrieving revision 2.184
diff -C2 -r2.183 -r2.184
*** ceval.c	2000/07/09 03:09:56	2.183
--- ceval.c	2000/07/11 21:59:16	2.184
***************
*** 24,27 ****
--- 24,31 ----
  #include "opcode.h"
  
+ #ifdef macintosh
+ #include "macglue.h"
+ #endif
+ 
  #include <ctype.h>
  

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.140
retrieving revision 2.141
diff -C2 -r2.140 -r2.141
*** import.c	2000/07/09 03:09:56	2.140
--- import.c	2000/07/11 21:59:16	2.141
***************
*** 699,703 ****
  		PySys_WriteStderr("# wrote %s\n", cpathname);
  #ifdef macintosh
! 	setfiletype(cpathname, 'Pyth', 'PYC ');
  #endif
  }
--- 699,703 ----
  		PySys_WriteStderr("# wrote %s\n", cpathname);
  #ifdef macintosh
! 	PyMac_setfiletype(cpathname, 'Pyth', 'PYC ');
  #endif
  }

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.102
retrieving revision 2.103
diff -C2 -r2.102 -r2.103
*** pythonrun.c	2000/07/11 17:53:00	2.102
--- pythonrun.c	2000/07/11 21:59:16	2.103
***************
*** 35,38 ****
--- 35,41 ----
  #endif
  
+ #ifdef macintosh
+ #include "macglue.h"
+ #endif
  extern char *Py_GetPath();
  
***************
*** 562,567 ****
  #ifdef macintosh
  	/* On a mac, we also assume a pyc file for types 'PYC ' and 'APPL' */
! 	    || getfiletype(filename) == 'PYC '
! 	    || getfiletype(filename) == 'APPL'
  #endif /* macintosh */
  		) {
--- 565,570 ----
  #ifdef macintosh
  	/* On a mac, we also assume a pyc file for types 'PYC ' and 'APPL' */
! 	    || PyMac_getfiletype(filename) == 'PYC '
! 	    || PyMac_getfiletype(filename) == 'APPL'
  #endif /* macintosh */
  		) {