summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-02-28 13:33:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-02-28 13:33:11 +0000
commitaaf1b41dfa7024da25a1f52cdbe5e89da7862b7b (patch)
treeaa38366082363960bfbfae3cfd497c3c7b69a2d9
parent5ac3f7c155b149b0a8b8e21056e0cc38cb76ce14 (diff)
downloadATCD-aaf1b41dfa7024da25a1f52cdbe5e89da7862b7b.tar.gz
Wed Feb 28 13:32:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/config-hpux-11.00.h22
2 files changed, 11 insertions, 18 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8894e226870..c1ddd078495 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 28 13:32:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-hpux-11.00.h:
+ Moved ACE_HAS_SSIZE_T outside of the compiler specific part, gcc
+ and aCC do have ssize_t. Also moved ACE_HAS_XPG4_MULTIBYTE_CHAR
+ outside of the compiler part.
+
Wed Feb 28 11:09:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_unistd.cpp (num_processors):
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 4f0a605255d..c4801cfa514 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -19,18 +19,6 @@
# include "ace/config-g++-common.h"
-# if __GLIBC__ >= 2
- // glibc 2 and higher has wchar support
-# define ACE_HAS_XPG4_MULTIBYTE_CHAR
-# endif
-
-// gcc 2.95.2 supplies the ssize_t typedef.
-# define ACE_HAS_SSIZE_T
-
-// gcc 3.0 claims to have wide character stuff, but (at least the version
-// built by HP) can't actually compile it. It refers to a wctype.h file
-// that's only available with aC++.
-
#else
// The following configuration section is designed to work for HP
@@ -140,14 +128,8 @@
// Compiler supports template specialization.
# define ACE_HAS_TEMPLATE_SPECIALIZATION
-// Platform has XPG4 wide character support
-# define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
# endif /* __cplusplus < 199707L */
-// Compiler supports the ssize_t typedef.
-# define ACE_HAS_SSIZE_T
-
// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h)
# define ACE_LACKS_SIGNED_CHAR
@@ -332,6 +314,8 @@
// Platform's sigaction() function takes const sigaction* as 2nd parameter.
#define ACE_HAS_SIGACTION_CONSTP2
+#define ACE_HAS_SSIZE_T
+
// Platform supports SVR4 extended signals
#define ACE_HAS_SIGINFO_T
@@ -344,6 +328,8 @@
/* Platform provides socklen_t type, such as Linux with glibc2. */
#define ACE_HAS_SOCKLEN_T 1
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR
+
/* Platform/compiler supports _sys_errlist symbol */
#define ACE_HAS_SYS_ERRLIST 1