diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-17 15:21:28 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-17 15:21:28 +0000 |
| commit | 402db6ed2bc96ec92cd43ee496e534a7dd9a0f98 (patch) | |
| tree | 059f4a996fcec575a9a4369510cfe4ccb1a998fd /ace/Malloc.h | |
| parent | 50905c75e92c5ab549ad290dcfbf2c4f9780065b (diff) | |
| download | ATCD-402db6ed2bc96ec92cd43ee496e534a7dd9a0f98.tar.gz | |
ChangeLogTag:Tue Jun 17 15:21:36 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'ace/Malloc.h')
| -rw-r--r-- | ace/Malloc.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ace/Malloc.h b/ace/Malloc.h index eb2c65fa31b..696a74c0836 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -25,14 +25,14 @@ #include "ace/Log_Msg.h" #if defined (ACE_HAS_MALLOC_STATS) -#include "ace/Atomic_Op.h" -#if defined (ACE_HAS_THREADS) -#include "ace/Process_Mutex.h" -#define ACE_PROCESS_MUTEX ACE_Process_Mutex -#else -#include "ace/SV_Semaphore_Simple.h" -#define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple -#endif /* ACE_HAS_THREADS */ +# include "ace/Atomic_Op.h" +# if defined (ACE_HAS_THREADS) +# include "ace/Process_Mutex.h" +# define ACE_PROCESS_MUTEX ACE_Process_Mutex +# else /* ACE_HAS_THREADS */ +# include "ace/SV_Semaphore_Simple.h" +# define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple +# endif /* ACE_HAS_THREADS */ typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; @@ -199,9 +199,9 @@ struct ACE_Export ACE_Malloc_Stats /// Number of blocks in use ACE_INT ninuse_; }; -#define ACE_MALLOC_STATS(X) X +# define ACE_MALLOC_STATS(X) X #else -#define ACE_MALLOC_STATS(X) +# define ACE_MALLOC_STATS(X) #endif /* ACE_HAS_MALLOC_STATS */ #if !defined (ACE_MALLOC_PADDING) @@ -210,7 +210,7 @@ struct ACE_Export ACE_Malloc_Stats // when you want areas to be at least a page long, or 32K long, or // something like that. -#define ACE_MALLOC_PADDING 1 +# define ACE_MALLOC_PADDING 1 #endif /* ACE_MALLOC_PADDING */ union ACE_max_align_info @@ -223,11 +223,11 @@ union ACE_max_align_info #if !defined (ACE_MALLOC_ALIGN) // Align the malloc header size to a multiple of a double. -#define ACE_MALLOC_ALIGN (sizeof (ACE_max_align_info)) +# define ACE_MALLOC_ALIGN (sizeof (ACE_max_align_info)) #endif /* ACE_MALLOC_ALIGN */ #if !defined ACE_MALLOC_ROUNDUP -#define ACE_MALLOC_ROUNDUP(X, Y) ((X) + ((Y) - 1) & ~((Y) - 1)) +# define ACE_MALLOC_ROUNDUP(X, Y) ((X) + ((Y) - 1) & ~((Y) - 1)) #endif // ACE_MALLOC_HEADER_SIZE is the normalized malloc header size. |