ChangeLogTag:Thu Jul 8 11:33:50 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

10 files changed, 14 insertions, 9 deletions

diff --git a/ace/Malloc.h b/ace/Malloc.h
index d7d6d135ce0..4c78cd702f3 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -78,12 +78,6 @@ struct ACE_Export ACE_Malloc_Stats
 #define ACE_MALLOC_PADDING 1
 #endif /* ACE_MALLOC_PADDING */
 
-// The following is only for backwards compatibility.
-#if defined (ACE_MALLOC_ALIGN)
-#undef ACE_MALLOC_PADDING
-#define ACE_MALLOC_PADDING ACE_MALLOC_ALIGN
-#endif /* ACE_MALLOC_ALIGN */
-
 class ACE_Export ACE_Malloc_Header
 {
   // = TITLE
diff --git a/ace/OS.h b/ace/OS.h
index c04371f82ff..18bc743262a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -26,6 +26,10 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_MALLOC_ALIGN)
+#define ACE_MALLOC_ALIGN ((int) sizeof (long))
+#endif /* ACE_MALLOC_ALIGN */
+
 // Do not change these values wantonly since GPERF depends on them..
 #define ACE_ASCII_SIZE 128
 #define ACE_EBCDIC_SIZE 256
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 1c3bd127710..81084f6cdc1 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -216,6 +216,7 @@
 #define ACE_HAS_SIGTHREADMASK
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_MALLOC_ALIGN 8
 
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 5665994c5d5..8c7cbba927d 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -147,4 +147,6 @@ extern "C"
   int putenv (const char *);
 }
 
+#define ACE_MALLOC_ALIGN 8
+
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index f73da5be558..143911616af 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -240,5 +240,5 @@
 #define ACE_PSOS_DIAB
 
 #define ACE_PSOS_DIAB_MIPS
-
+#define ACE_MALLOC_ALIGN 8
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index f37d033132f..346c4a225d7 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -242,5 +242,5 @@
 #define ACE_PSOS_DIAB
 
 #define ACE_PSOS_DIAB_PPC
-
+#define ACE_MALLOC_ALIGN 8
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 792ef8ad395..bcf17c2a2cd 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -226,6 +226,8 @@
 #define ACE_PSOS
 #endif /* ACE_PSOS */
 
+#define ACE_MALLOC_ALIGN 8
+
 #if !defined (ACE_PSOS_DIAB)
 #define ACE_PSOS_DIAB
 #endif /* ACE_PSOS_DIAB */
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index ecf773da28f..3cd8459cb1a 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -205,5 +205,5 @@
 #define ACE_PSOS_TBD
 #endif /* ACE_PSOS_TBD */
 #define ACE_LACKS_MKFIFO
-
+#define ACE_MALLOC_ALIGN 8
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 02e6b975e31..4c85ea9f202 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -240,4 +240,5 @@
 #endif /* #if !defined (ACE_USE_RCSID) */
 #define ACE_LACKS_MKFIFO
 
+#define ACE_MALLOC_ALIGN 8
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 0487c26fd6c..27c6d14931d 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -333,4 +333,5 @@
 # define ACE_HAS_X86_STAT_MACROS
 #endif /* i386 */
 
+#define ACE_MALLOC_ALIGN 8
 #endif /* ACE_CONFIG_H */