[Python-checkins] CVS: python/dist/src/Mac/Modules macmodule.c,1.42,1.43

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv12223/Python/Mac/Modules

Modified Files:
	macmodule.c 
Log Message:
Be more sensible about when to use TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON. This should greatly facilitate porting stuff to OSX in its MachO/BSD incarnation.

Index: macmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macmodule.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** macmodule.c	2001/01/12 23:37:14	1.42
--- macmodule.c	2001/05/12 21:31:30	1.43
***************
*** 32,36 ****
  #include <errno.h>
  
! #if !TARGET_API_MAC_CARBON
  /* Skip for Carbon */
  #include "macstat.h"
--- 32,36 ----
  #include <errno.h>
  
! #if TARGET_API_MAC_OS8
  /* Skip for Carbon */
  #include "macstat.h"
***************
*** 52,56 ****
  #include <sys/stat.h>
  #else /* USE_GUSI */
! #if !TARGET_API_MAC_CARBON
  #define stat macstat
  #endif
--- 52,56 ----
  #include <sys/stat.h>
  #else /* USE_GUSI */
! #if TARGET_API_MAC_OS8
  #define stat macstat
  #endif
***************
*** 260,264 ****
  #endif
  
! #if !TARGET_API_MAC_CARBON
  static PyObject *
  mac_getbootvol(self, args)
--- 260,264 ----
  #endif
  
! #if TARGET_API_MAC_OS8
  static PyObject *
  mac_getbootvol(self, args)
***************
*** 500,504 ****
  #endif /* WEHAVE_FSTAT */
  
! #if !TARGET_API_MAC_CARBON
  static PyObject *
  mac_xstat(self, args)
--- 500,504 ----
  #endif /* WEHAVE_FSTAT */
  
! #if TARGET_API_MAC_OS8
  static PyObject *
  mac_xstat(self, args)
***************
*** 612,616 ****
  	{"fstat",	mac_fstat},
  #endif
! #if !TARGET_API_MAC_CARBON
  	{"getbootvol",	mac_getbootvol}, /* non-standard */
  #endif
--- 612,616 ----
  	{"fstat",	mac_fstat},
  #endif
! #if TARGET_API_MAC_OS8
  	{"getbootvol",	mac_getbootvol}, /* non-standard */
  #endif
***************
*** 624,628 ****
  	{"rmdir",	mac_rmdir},
  	{"stat",	mac_stat},
! #if !TARGET_API_MAC_CARBON
  	{"xstat",	mac_xstat},
  #endif
--- 624,628 ----
  	{"rmdir",	mac_rmdir},
  	{"stat",	mac_stat},
! #if TARGET_API_MAC_OS8
  	{"xstat",	mac_xstat},
  #endif