[Python-checkins] python/dist/src/Include Python.h,2.46,2.47 pyport.h,2.47,2.48

[jlt63@sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv15382/Include

Modified Files:
	Python.h pyport.h 
Log Message:
Patch #555929: Cygwin AH_BOTTOM cleanup patch

This patch complies with the following request found 
near the top of configure.in: 

# This is for stuff that absolutely must end up in pyconfig.h. 
# Please use pyport.h instead, if possible. 

I tested this patch under Cygwin, Win32, and Red 
Hat Linux. Python built and ran successfully on 
each of these platforms.


Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -d -r2.46 -r2.47
*** Python.h	26 Apr 2002 19:40:56 -0000	2.46
--- Python.h	15 May 2002 11:48:32 -0000	2.47
***************
*** 23,26 ****
--- 23,27 ----
  #include "patchlevel.h"
  #include "pyconfig.h"
+ #include "pyport.h"
  
  #ifdef HAVE_LIMITS_H
***************
*** 28,32 ****
  #endif
  
! /* pyconfig.h may or may not define DL_IMPORT */
  #ifndef DL_IMPORT	/* declarations for DLL import/export */
  #define DL_IMPORT(RTYPE) RTYPE
--- 29,33 ----
  #endif
  
! /* pyconfig.h or pyport.h may or may not define DL_IMPORT */
  #ifndef DL_IMPORT	/* declarations for DLL import/export */
  #define DL_IMPORT(RTYPE) RTYPE
***************
*** 59,64 ****
   */
  #include <assert.h>
- 
- #include "pyport.h"
  
  /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
--- 60,63 ----

Index: pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -d -r2.47 -r2.48
*** pyport.h	12 Apr 2002 07:22:56 -0000	2.47
--- pyport.h	15 May 2002 11:48:32 -0000	2.48
***************
*** 385,391 ****
--- 385,401 ----
  #endif
  
+ #ifndef __CYGWIN__
  #ifndef DL_IMPORT       /* declarations for DLL import */
  #define DL_IMPORT(RTYPE) RTYPE
  #endif
+ #else /* __CYGWIN__ */
+ #ifdef USE_DL_IMPORT
+ #define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
+ #define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
+ #else /* !USE_DL_IMPORT */
+ #define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
+ #define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
+ #endif /* USE_DL_IMPORT */
+ #endif /* __CYGWIN__ */
  
  /* If the fd manipulation macros aren't defined,