diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-17 04:04:44 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-17 04:04:44 +0000 |
| commit | 2e413354c797bb9f1e12d6e2297c347c92c27dc0 (patch) | |
| tree | 8a9b4fd2e49f774b808513e3ddc1f96c532d6717 /ace/OS_Memory.h | |
| parent | 0466b3f531afbc5a44a985fa12edf7977b390ad8 (diff) | |
| download | ATCD-pace_removal.tar.gz | |
ChangeLogTag:Wed Jul 17 03:50:56 UTC 2002 Don Hinton <dhinton@objectsciences.com>pace_removal
Diffstat (limited to 'ace/OS_Memory.h')
| -rw-r--r-- | ace/OS_Memory.h | 59 |
1 files changed, 16 insertions, 43 deletions
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index 0e53f1f7981..54e94d9031c 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -24,10 +24,6 @@ #include "ace/OS_Errno.h" -#if defined (ACE_HAS_PACE) -# include /**/ "pace/stdlib.h" -#endif /* ACE_HAS_PACE */ - #ifndef ACE_HAS_WINCE #include <stddef.h> #endif // ACE_HAS_WINCE @@ -52,47 +48,24 @@ // too, so that you guarantee that strdup() calls your desired mallocator // and not the system mallocator. // -# 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) -typedef char *ACE_MALLOC_T; -# else -typedef void *ACE_MALLOC_T; -# 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) +#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 +#else typedef void *ACE_MALLOC_T; -# endif /* ACE_HAS_OLD_MALLOC */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_OLD_MALLOC */ /** * @class ACE_OS_Memory |