summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2011-03-16 12:13:54 +0000
committerSteve Huston <shuston@riverace.com>2011-03-16 12:13:54 +0000
commit7274f1df365342c90994458baed21afe696f987d (patch)
treebef8452d66a7105d8d9bbe0cc752bcba79b12cb6
parent2f5a909c2f0d510de0182a50a99a750d0098545c (diff)
downloadATCD-7274f1df365342c90994458baed21afe696f987d.tar.gz
ChangeLogTag:Wed Mar 16 12:08:36 UTC 2011 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog4
-rw-r--r--ace/config-aix-7.h29
2 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d124afeba2c..707a152bf28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 16 12:08:36 UTC 2011 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix-7.h: New config for AIX 7.
+
Mon Feb 28 20:29:59 UTC 2011 Steve Huston <shuston@riverace.com>
* examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp:
diff --git a/ace/config-aix-7.h b/ace/config-aix-7.h
new file mode 100644
index 00000000000..f4aff28cde6
--- /dev/null
+++ b/ace/config-aix-7.h
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file config-aix-7.h
+ *
+ * $Id$
+ *
+ * This is the config file for AIX 7 and higher.
+ *
+ * @author Steve Huston <shuston@riverace.com>
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_AIX_7_H
+#define ACE_CONFIG_AIX_7_H
+
+// Diffs from prior AIX versions are related to scandir() arguments.
+#include "ace/config-aix-5.x.h"
+
+#ifdef ACE_SCANDIR_CMP_USES_VOIDPTR
+# undef ACE_SCANDIR_CMP_USES_VOIDPTR
+#endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */
+
+#ifdef ACE_SCANDIR_SEL_LACKS_CONST
+# undef ACE_SCANDIR_SEL_LACKS_CONST
+#endif /* ACE_SCANDIR_SEL_LACKS_CONST */
+
+#endif /* ACE_CONFIG_AIX_7_H */