/[escript]/branches/windows_from_1456_trunk_1580_merged_in/esysUtils/src/esys_malloc.h
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1580_merged_in/esysUtils/src/esys_malloc.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1611 by phornby, Thu Jun 5 05:50:20 2008 UTC revision 1612 by phornby, Mon Jun 16 14:01:00 2008 UTC
# Line 26  Line 26 
26    
27  #ifdef _WIN32  #ifdef _WIN32
28    
 #   ifdef _DEBUG  
 #      define TMP_DEF_FLAG  
 #      undef _DEBUG  
 #   endif  
29  #   include <python.h>  #   include <python.h>
30  #   ifdef TMP_DEF_FLAG  
 #      undef TMP_DEF_FLAG  
 #   define _DEBUG  
 #   endif  
31  #   define ESYS_MALLOC PyMem_Malloc  #   define ESYS_MALLOC PyMem_Malloc
32  #   define ESYS_FREE PyMem_Free  #   define ESYS_FREE PyMem_Free
33  #   define ESYS_REALLOC PyMem_Realloc  #   define ESYS_REALLOC PyMem_Realloc
34    
35  #else  #else
36    
37  #   include <malloc.h>  #   include <malloc.h>
38  #   define ESYS_MALLOC malloc  
39  #   define ESYS_FREE free  #   define ESYS_MALLOC ::malloc
40  #   define ESYS_REALLOC realloc  #   define ESYS_FREE ::free
41    #   define ESYS_REALLOC ::realloc
42    
43  #endif  #endif
44    

Legend:
Removed from v.1611  
changed lines
  Added in v.1612

  ViewVC Help
Powered by ViewVC 1.1.26