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

loewis@sourceforge.net loewis@sourceforge.net
Wed, 15 May 2002 11:24:08 -0700


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

Modified Files:
	Python.h pyport.h 
Log Message:



Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -d -r2.47 -r2.48
*** Python.h	15 May 2002 11:48:32 -0000	2.47
--- Python.h	15 May 2002 18:24:06 -0000	2.48
***************
*** 23,27 ****
  #include "patchlevel.h"
  #include "pyconfig.h"
- #include "pyport.h"
  
  #ifdef HAVE_LIMITS_H
--- 23,26 ----
***************
*** 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
--- 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
***************
*** 60,63 ****
--- 59,64 ----
   */
  #include <assert.h>
+ 
+ #include "pyport.h"
  
  /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.

Index: pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -d -r2.48 -r2.49
*** pyport.h	15 May 2002 11:48:32 -0000	2.48
--- pyport.h	15 May 2002 18:24:06 -0000	2.49
***************
*** 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,
--- 385,391 ----