summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2011-07-01 10:04:07 +0000
committerOlli Savia <ops@iki.fi>2011-07-01 10:04:07 +0000
commit39d355621ffbdf7f952fab39fc1a7cebb02153af (patch)
treefa67519c7807b1bdfdd0275b14f3d1ec4dd44e06
parent36b9bc7989ee2b9c786611cde98b2d34936b296c (diff)
downloadATCD-39d355621ffbdf7f952fab39fc1a7cebb02153af.tar.gz
ChangeLogTag: Fri Jul 1 10:01:54 UTC 2011 Olli Savia <ops@iki.fi>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/config-linux.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 26a68c0a1d3..8719302b062 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 1 10:01:54 UTC 2011 Olli Savia <ops@iki.fi>
+
+ * ace/config-linux.h:
+ Reverted __ACE_INLINE__ removal.
+
Fri Jul 1 09:31:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-openvms.h:
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 4a86377971d..b4fff00a671 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -13,6 +13,10 @@
# define ACE_MT_SAFE 1
#endif
+#if !defined (__ACE_INLINE__)
+# define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
#define ACE_PLATFORM_CONFIG config-linux.h
#define ACE_HAS_BYTESEX_H