From ba82286f2eb59c1f27c4c97e27087a68110b408e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 25 Sep 2002 11:05:41 +0000
Subject: [PATCH] Added AIX config fixes supplied by Markus Schoepflin.

[SVN r15504]
---
 include/boost/config/compiler/vacpp.hpp | 13 ++++++++++---
 include/boost/config/platform/aix.hpp   |  7 +++++--
 include/boost/config/stdlib/vacpp.hpp   |  5 ++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp
index 6e575db7..371aae83 100644
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -7,9 +7,16 @@
 
 //  Visual Age (IBM) C++ compiler setup:
 
-#define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
+#if __IBMCPP__ <= 501
+#  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+#  define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+#  define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
+#endif
+
+#if (__IBMCPP__ <= 502)|| !defined(BOOST_STRICT_CONFIG)
+#  define BOOST_NO_INTEGRAL_INT64_T
+#endif
+
 //
 // On AIX thread support seems to be indicated by _THREAD_SAFE:
 //
diff --git a/include/boost/config/platform/aix.hpp b/include/boost/config/platform/aix.hpp
index 670bf0bc..d39a63e9 100644
--- a/include/boost/config/platform/aix.hpp
+++ b/include/boost/config/platform/aix.hpp
@@ -10,12 +10,15 @@
 #define BOOST_PLATFORM "IBM Aix"
 
 #define BOOST_HAS_UNISTD_H
-#define BOOST_HAS_PTHREADS
 #define BOOST_HAS_NL_TYPES_H
+#define BOOST_HAS_NANOSLEEP
+#define BOOST_HAS_CLOCK_GETTIME
 
 // Threading API's:
+#define BOOST_HAS_PTHREADS
 #define BOOST_HAS_PTHREAD_DELAY_NP
-#define BOOST_HAS_PTHREAD_YIELD
+#define BOOST_HAS_SCHED_YIELD
+//#define BOOST_HAS_PTHREAD_YIELD
 
 // boilerplate code:
 #include <boost/config/posix_features.hpp>
diff --git a/include/boost/config/stdlib/vacpp.hpp b/include/boost/config/stdlib/vacpp.hpp
index ad4d2fc4..2d5bf570 100644
--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@@ -5,8 +5,11 @@
 
 //  See http://www.boost.org for most recent version.
 
+#if __IBMCPP__ <= 501
+#  define BOOST_NO_STD_ALLOCATOR
+#endif
+
 #define BOOST_HAS_MACRO_USE_FACET
-#define BOOST_NO_STD_ALLOCATOR
 
 #define BOOST_STDLIB "Visual Age default standard library"