[Python-checkins] python/dist/src/Include pymem.h,2.11,2.12

nascheme@sourceforge.net nascheme@sourceforge.net
Thu, 11 Apr 2002 19:39:20 -0700


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

Modified Files:
	pymem.h 
Log Message:
Remove PyMalloc_* symbols.  PyObject_Malloc now uses pymalloc if
it's enabled.


Index: pymem.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pymem.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** pymem.h	1 Apr 2002 06:04:21 -0000	2.11
--- pymem.h	12 Apr 2002 02:39:18 -0000	2.12
***************
*** 91,124 ****
  
  
- /* pymalloc (private to the interpreter) */
- #ifdef WITH_PYMALLOC
- DL_IMPORT(void *) _PyMalloc_Malloc(size_t nbytes);
- DL_IMPORT(void *) _PyMalloc_Realloc(void *p, size_t nbytes);
- DL_IMPORT(void) _PyMalloc_Free(void *p);
- 
- #ifdef PYMALLOC_DEBUG
- DL_IMPORT(void *) _PyMalloc_DebugMalloc(size_t nbytes);
- DL_IMPORT(void *) _PyMalloc_DebugRealloc(void *p, size_t nbytes);
- DL_IMPORT(void) _PyMalloc_DebugFree(void *p);
- DL_IMPORT(void) _PyMalloc_DebugDumpAddress(const void *p);
- DL_IMPORT(void) _PyMalloc_DebugCheckAddress(const void *p);
- DL_IMPORT(void) _PyMalloc_DebugDumpStats(void);
- #define _PyMalloc_MALLOC _PyMalloc_DebugMalloc
- #define _PyMalloc_REALLOC _PyMalloc_DebugRealloc
- #define _PyMalloc_FREE _PyMalloc_DebugFree
- 
- #else	/* WITH_PYMALLOC && ! PYMALLOC_DEBUG */
- #define _PyMalloc_MALLOC _PyMalloc_Malloc
- #define _PyMalloc_REALLOC _PyMalloc_Realloc
- #define _PyMalloc_FREE _PyMalloc_Free
- #endif
- 
- #else	/* ! WITH_PYMALLOC */
- #define _PyMalloc_MALLOC PyMem_MALLOC
- #define _PyMalloc_REALLOC PyMem_REALLOC
- #define _PyMalloc_FREE PyMem_FREE
- #endif	/* WITH_PYMALLOC */
- 
- 
  #ifdef __cplusplus
  }
--- 91,94 ----