[Python-checkins] CVS: python/dist/src/Mac/Modules/ae _AEmodule.c,1.6,1.6.2.1 aescan.py,1.12,1.12.12.1

[Jack Jansen]

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

Modified Files:
      Tag: r22rc1-branch
	_AEmodule.c aescan.py 
Log Message:
Merged Mac subtree into the 22c1 branch.


Index: _AEmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/_AEmodule.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** _AEmodule.c	2001/12/08 18:02:51	1.6
--- _AEmodule.c	2001/12/19 15:10:13	1.6.2.1
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */

Index: aescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/aescan.py,v
retrieving revision 1.12
retrieving revision 1.12.12.1
diff -C2 -d -r1.12 -r1.12.12.1
*** aescan.py	2001/08/03 13:31:36	1.12
--- aescan.py	2001/12/19 15:10:13	1.12.12.1
***************
*** 16,20 ****
  def main():
  	print "=== Scanning AEDataModel.h, AppleEvents.h, AERegistry.h, AEObjects.h ==="
! 	input = ["AEDataModel.h", "AppleEvents.h", "AERegistry.h", "AEObjects.h"]
  	output = "aegen.py"
  	defsoutput = TOOLBOXDIR + "AppleEvents.py"
--- 16,20 ----
  def main():
  	print "=== Scanning AEDataModel.h, AppleEvents.h, AERegistry.h, AEObjects.h ==="
! 	input = ["AEDataModel.h", "AEInteraction.h", "AppleEvents.h", "AERegistry.h", "AEObjects.h"]
  	output = "aegen.py"
  	defsoutput = TOOLBOXDIR + "AppleEvents.py"