[Python-checkins] CVS: python/dist/src/Include Python.h,2.32.2.3,2.32.2.4 pgenheaders.h,2.24,2.24.8.1 pydebug.h,2.15,2.15.8.1 pymem.h,2.3,2.3.8.1 pyport.h,2.26.6.1,2.26.6.2

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	Python.h pgenheaders.h pydebug.h pymem.h pyport.h 
Log Message:
Merge of trunk tags date2001-07-21 to date2001-07-28.


Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.32.2.3
retrieving revision 2.32.2.4
diff -C2 -d -r2.32.2.3 -r2.32.2.4
*** Python.h	2001/07/16 21:38:09	2.32.2.3
--- Python.h	2001/07/28 05:02:58	2.32.2.4
***************
*** 22,26 ****
  
  #include "patchlevel.h"
! #include "config.h"
  
  #ifdef HAVE_LIMITS_H
--- 22,26 ----
  
  #include "patchlevel.h"
! #include "pyconfig.h"
  
  #ifdef HAVE_LIMITS_H
***************
*** 28,32 ****
  #endif
  
! /* config.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

Index: pgenheaders.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pgenheaders.h,v
retrieving revision 2.24
retrieving revision 2.24.8.1
diff -C2 -d -r2.24 -r2.24.8.1
*** pgenheaders.h	2000/09/01 23:29:26	2.24
--- pgenheaders.h	2001/07/28 05:02:58	2.24.8.1
***************
*** 8,14 ****
  /* Include files and extern declarations used by most of the parser. */
  
! #include "config.h"
  
! /* config.h may or may not define DL_IMPORT */
  #ifndef DL_IMPORT	/* declarations for DLL import/export */
  #define DL_IMPORT(RTYPE) RTYPE
--- 8,14 ----
  /* Include files and extern declarations used by most of the parser. */
  
! #include "pyconfig.h"
  
! /* pyconfig.h may or may not define DL_IMPORT */
  #ifndef DL_IMPORT	/* declarations for DLL import/export */
  #define DL_IMPORT(RTYPE) RTYPE

Index: pydebug.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pydebug.h,v
retrieving revision 2.15
retrieving revision 2.15.8.1
diff -C2 -d -r2.15 -r2.15.8.1
*** pydebug.h	2000/09/01 23:29:26	2.15
--- pydebug.h	2001/07/28 05:02:58	2.15.8.1
***************
*** 15,18 ****
--- 15,24 ----
  extern DL_IMPORT(int) Py_TabcheckFlag;
  extern DL_IMPORT(int) Py_UnicodeFlag;
+ extern DL_IMPORT(int) Py_IgnoreEnvironmentFlag;
+ 
+ /* this is a wrapper around getenv() that pays attention to
+    Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
+    PYTHONPATH and PYTHONHOME from the environment */
+ #define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
  
  DL_IMPORT(void) Py_FatalError(char *message);

Index: pymem.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pymem.h,v
retrieving revision 2.3
retrieving revision 2.3.8.1
diff -C2 -d -r2.3 -r2.3.8.1
*** pymem.h	2000/09/01 23:29:26	2.3
--- pymem.h	2001/07/28 05:02:58	2.3.8.1
***************
*** 141,145 ****
     d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
  
!    In this case, you would define (for example in config.h) :
  
     #define PyCore_MALLOC_FUNC      d_malloc
--- 141,145 ----
     d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
  
!    In this case, you would define (for example in pyconfig.h) :
  
     #define PyCore_MALLOC_FUNC      d_malloc

Index: pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.26.6.1
retrieving revision 2.26.6.2
diff -C2 -d -r2.26.6.1 -r2.26.6.2
*** pyport.h	2001/07/07 22:55:27	2.26.6.1
--- pyport.h	2001/07/28 05:02:58	2.26.6.2
***************
*** 2,6 ****
  #define Py_PYPORT_H
  
! #include "config.h" /* include for defines */
  
  /**************************************************************************
--- 2,6 ----
  #define Py_PYPORT_H
  
! #include "pyconfig.h" /* include for defines */
  
  /**************************************************************************
***************
*** 129,133 ****
   * and/or
   *      #define DONT_HAVE_FSTAT
!  * to your config.h. Python code beyond this should check HAVE_STAT and
   * HAVE_FSTAT instead.
   * Also
--- 129,133 ----
   * and/or
   *      #define DONT_HAVE_FSTAT
!  * to your pyconfig.h. Python code beyond this should check HAVE_STAT and
   * HAVE_FSTAT instead.
   * Also