summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2010-02-26 19:33:43 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2010-02-26 19:33:43 +0000
commit3788551ddc93c49b471461747a2d72e264e7c0ac (patch)
tree422dd88c303b9caf939e07c28f5a5794c046a220
parent3ea4e2cabba4b4814448d652f4ee4c58c67f304b (diff)
downloadATCD-3788551ddc93c49b471461747a2d72e264e7c0ac.tar.gz
ChangeLogTag: Fri Feb 26 19:32:06 UTC 2010 Adam Mitz <mitza@ociweb.com>
-rw-r--r--ACE/ChangeLog12
-rw-r--r--ACE/ace/config-sunos5.10.h8
-rw-r--r--ACE/ace/config-sunos5.5.h5
3 files changed, 23 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 30443a7c79e..94e83674f55 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 26 19:32:06 UTC 2010 Adam Mitz <mitza@ociweb.com>
+
+ * ace/config-sunos5.5.h:
+
+ Moved #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL to a
+ non-compiler-specific section.
+
+ * ace/config-sunos5.10.h:
+
+ Added #undef ACE_LACKS_CEILL & ACE_LACKS_FLOORL because they are
+ available on Solaris 10.
+
Fri Feb 26 18:30:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_sys_time.inl:
diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h
index ca5b979495b..6d28b1c2257 100644
--- a/ACE/ace/config-sunos5.10.h
+++ b/ACE/ace/config-sunos5.10.h
@@ -32,6 +32,14 @@
# undef ACE_LACKS_ISBLANK
#endif
+#if defined (ACE_LACKS_CEILL)
+# undef ACE_LACKS_CEILL
+#endif
+
+#if defined (ACE_LACKS_FLOORL)
+# undef ACE_LACKS_FLOORL
+#endif
+
// Solaris 10 delivers pthread_attr_setstack
#if defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK)
# undef ACE_LACKS_PTHREAD_ATTR_SETSTACK
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 4b24d32047e..9564d33150d 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -24,6 +24,9 @@
// SunOS 5.5 does not provide getloadavg()
#define ACE_LACKS_GETLOADAVG
+#define ACE_LACKS_CEILL
+#define ACE_LACKS_FLOORL
+
// Some SunOS releases define _POSIX_PTHREAD_SEMANTICS automatically.
// We need to be check if the user has manually defined the macro before
// including <sys/feature_tests.h>.
@@ -130,8 +133,6 @@
// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
// this must appear before its #include.
# define ACE_HAS_STRING_CLASS
-# define ACE_LACKS_CEILL
-# define ACE_LACKS_FLOORL
# include "ace/config-g++-common.h"