summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-05 11:09:57 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-05 11:09:57 +0000
commitba60549a851c698e7f45ece76064bfd846fcdc83 (patch)
tree71e5841a430e73f288c0fe7e9f91cda315afdc34
parent8f68ae97d2df322205c0c2c7b245d0028c52265f (diff)
downloadATCD-ba60549a851c698e7f45ece76064bfd846fcdc83.tar.gz
Fri Jan 5 11:09:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/config-hpux-11.00.h14
2 files changed, 13 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 821fd0f1b70..90a04aa5f66 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 5 11:09:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-hpux-11.00.h:
+ Moved ACE_SIZEOF_LONG outside the aCC specific block, this is
+ also needed with GCC
+
Fri Jan 5 10:40:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Thread_Creation_Threshold_Test.cpp:
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 5df36d348be..a52f56f7aed 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -135,13 +135,6 @@
// Compiler supports template specialization.
# define ACE_HAS_TEMPLATE_SPECIALIZATION
-// Preprocessor needs some help with data types
-# if defined (__LP64__)
-# define ACE_SIZEOF_LONG 8
-# else
-# define ACE_SIZEOF_LONG 4
-# endif
-
// Platform has XPG4 wide character support
# define ACE_HAS_XPG4_MULTIBYTE_CHAR
# define ACE_SIZEOF_WCHAR _WCHAR_T
@@ -208,6 +201,13 @@
# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
#endif /* __LP64__ */
+// Preprocessor needs some help with data types
+#if defined (__LP64__)
+# define ACE_SIZEOF_LONG 8
+#else
+# define ACE_SIZEOF_LONG 4
+#endif
+
// Platform can do async I/O (aio_*) (set up in config-posix.h)
// ... but seems to require this in order to keep from hanging. Needs some
// investigation, maybe with HP. John Mulhern determined this value