/[escript]/branches/windows_from_1456_trunk_1580_merged_in/paso/src/Common.h
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1580_merged_in/paso/src/Common.h

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

revision 1616 by phornby, Sat Jun 14 09:36:48 2008 UTC revision 1617 by ksteube, Mon Jun 23 23:01:27 2008 UTC
# Line 95  typedef int err_t; Line 95  typedef int err_t;
95  /*    the main macros that follow                             */  /*    the main macros that follow                             */
96  /**************************************************************/  /**************************************************************/
97    
98  #if defined(_WIN32) // Use python for memory management on windows.  #if defined(_WIN32) /* Use python for memory management on windows. */
99    
100    #include <python.h>    #include <python.h>
101    
# Line 121  typedef int err_t; Line 121  typedef int err_t;
121  /* Also, _WIN32 may take this branch one day...                    */  /* Also, _WIN32 may take this branch one day...                    */
122  /* SO KEEP ALL THREAD_MEMALLOC/FREEs CONFINED TO THE PASO LIBRARY. */  /* SO KEEP ALL THREAD_MEMALLOC/FREEs CONFINED TO THE PASO LIBRARY. */
123    
124  #if defined(__ECC) && defined(_OPENMP) // ECC version of intel compiler with openmp.  #if defined(__ECC) && defined(_OPENMP) /* ECC version of intel compiler with openmp. */
125    #include <omp.h>    #include <omp.h>
126    #define PASO_THREAD_MALLOC kmp_malloc    #define PASO_THREAD_MALLOC kmp_malloc
127    #define PASO_THREAD_FREE kmp_free    #define PASO_THREAD_FREE kmp_free
Legend:
Removed from v.1616  
changed lines
  Added in v.1617
  ViewVC Help
Powered by ViewVC 1.1.26