diff options
| author | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-19 04:33:06 +0000 |
|---|---|---|
| committer | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-19 04:33:06 +0000 |
| commit | 490e3b7bde827dbd2d2e58c6079a6ba16c6ee01b (patch) | |
| tree | 872ccd5802f75e99e5343fb54ded522e16037638 /ace/OS_Memory.h | |
| parent | 8ff33e5c23740d3f6a29ff86f53e2afed43661be (diff) | |
| download | ATCD-490e3b7bde827dbd2d2e58c6079a6ba16c6ee01b.tar.gz | |
Tue Jul 18 23:30:59 2000 John Heitmann <jwh1@cs.wustl.edu>
Diffstat (limited to 'ace/OS_Memory.h')
| -rw-r--r-- | ace/OS_Memory.h | 59 |
1 files changed, 43 insertions, 16 deletions
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index d8165755388..1b115230dcc 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -27,7 +27,12 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/OS_Export.h" -#include /**/ <stddef.h> +#if defined (ACE_HAS_PACE) +# include "pace/stddef.h" +# include "pace/stdlib.h" +#else +# include /**/ <stddef.h> +#endif /* ACE_HAS_PACE */ # if !defined (ACE_MALLOC_ALIGN) # define ACE_MALLOC_ALIGN ((int) sizeof (long)) @@ -53,25 +58,47 @@ // too, so that you guarantee that strdup() calls your desired mallocator // and not the system mallocator. // -# if !defined (ACE_MALLOC_FUNC) -# define ACE_MALLOC_FUNC ::malloc -# endif -# if !defined (ACE_CALLOC_FUNC) -# define ACE_CALLOC_FUNC ::calloc -# endif -# if !defined (ACE_FREE_FUNC) -# define ACE_FREE_FUNC ::free -# endif -# if !defined (ACE_REALLOC_FUNC) -# define ACE_REALLOC_FUNC ::realloc -# endif +# if defined (ACE_HAS_PACE) +# if !defined (ACE_MALLOC_FUNC) +# define ACE_MALLOC_FUNC pace_malloc +# endif +# if !defined (ACE_CALLOC_FUNC) +# define ACE_CALLOC_FUNC pace_calloc +# endif +# if !defined (ACE_FREE_FUNC) +# define ACE_FREE_FUNC pace_free +# endif +# if !defined (ACE_REALLOC_FUNC) +# define ACE_REALLOC_FUNC pace_realloc +# endif -# if defined (ACE_HAS_OLD_MALLOC) +# if defined (ACE_HAS_OLD_MALLOC) typedef char *ACE_MALLOC_T; -# else +# else typedef void *ACE_MALLOC_T; -# endif /* ACE_HAS_OLD_MALLOC */ +# endif /* ACE_HAS_OLD_MALLOC */ + +# else +# if !defined (ACE_MALLOC_FUNC) +# define ACE_MALLOC_FUNC ::malloc +# endif +# if !defined (ACE_CALLOC_FUNC) +# define ACE_CALLOC_FUNC ::calloc +# endif +# if !defined (ACE_FREE_FUNC) +# define ACE_FREE_FUNC ::free +# endif +# if !defined (ACE_REALLOC_FUNC) +# define ACE_REALLOC_FUNC ::realloc +# endif + +# if defined (ACE_HAS_OLD_MALLOC) +typedef char *ACE_MALLOC_T; +# else +typedef void *ACE_MALLOC_T; +# endif /* ACE_HAS_OLD_MALLOC */ +#endif /* ACE_HAS_PACE */ class ACE_OS_Export ACE_OS_Memory // = TITLE |