ChangeLogTag:Fri Apr 5 19:20:39 2002 Steve Huston <shuston@riverace.com>

6 files changed, 52 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 04f7d89f2bd..7ef19413ef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Apr  5 19:20:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/Proactor.h: Add #include "ace/OS.h" in the "non-AIO" section
+          to get the ACE_Time_Value class needed for the stubbed-out class.
+
+        * ace/config-aix-4.x.h: Add some commentary about ACE_HAS_AIO_CALLS.
+
+        * ace/Service_Manager.cpp: Added #include "ace/Log_Msg.h" to fix a
+          compile problem on AIX.
+
 Fri Apr  5 11:30:00 2002  Justin Michel  <michel_j@ociweb.com>
         
         * ace/OS.i:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 04f7d89f2bd..7ef19413ef9 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Apr  5 19:20:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/Proactor.h: Add #include "ace/OS.h" in the "non-AIO" section
+          to get the ACE_Time_Value class needed for the stubbed-out class.
+
+        * ace/config-aix-4.x.h: Add some commentary about ACE_HAS_AIO_CALLS.
+
+        * ace/Service_Manager.cpp: Added #include "ace/Log_Msg.h" to fix a
+          compile problem on AIX.
+
 Fri Apr  5 11:30:00 2002  Justin Michel  <michel_j@ociweb.com>
         
         * ace/OS.i:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 04f7d89f2bd..7ef19413ef9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Fri Apr  5 19:20:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/Proactor.h: Add #include "ace/OS.h" in the "non-AIO" section
+          to get the ACE_Time_Value class needed for the stubbed-out class.
+
+        * ace/config-aix-4.x.h: Add some commentary about ACE_HAS_AIO_CALLS.
+
+        * ace/Service_Manager.cpp: Added #include "ace/Log_Msg.h" to fix a
+          compile problem on AIX.
+
 Fri Apr  5 11:30:00 2002  Justin Michel  <michel_j@ociweb.com>
         
         * ace/OS.i:
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 88df20ccd8c..36a3340717a 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -27,14 +27,14 @@
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
-#include "ace/OS.h"
-#include "ace/Asynch_IO.h"
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Timer_Queue.h"
-#include "ace/Timer_List.h"
-#include "ace/Timer_Heap.h"
-#include "ace/Timer_Wheel.h"
+#  include "ace/OS.h"
+#  include "ace/Asynch_IO.h"
+#  include "ace/Asynch_IO_Impl.h"
+#  include "ace/Thread_Manager.h"
+#  include "ace/Timer_Queue.h"
+#  include "ace/Timer_List.h"
+#  include "ace/Timer_Heap.h"
+#  include "ace/Timer_Wheel.h"
 
 // Forward declarations.
 class ACE_Proactor_Impl;
@@ -564,11 +564,14 @@ private:
   ACE_Proactor &operator= (const ACE_Proactor &);
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/Proactor.i"
-#endif /* __ACE_INLINE__ */
+#  if defined (__ACE_INLINE__)
+#    include "ace/Proactor.i"
+#  endif /* __ACE_INLINE__ */
 
 #else /* NOT WIN32 or POSIX with AIO features. */
+
+#  include "ace/OS.h"     // Need ACE_Time_Value
+
 class ACE_Export ACE_Proactor
 {
 public:
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 84fa709ddf8..e01c99052f5 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 #include "ace/Service_Repository.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Manager.h"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index e31e6ba6995..ebaf52a1093 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -117,6 +117,13 @@
 #  define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #endif /* ACE_AIX_VERS < 402 */
 
+#if (ACE_AIX_VERS >= 403)
+// AIX has AIO, but the functions don't match those of other AIO-enabled
+// platforms. If this is to work, it'll require some significant work,
+// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing.
+//#  define ACE_HAS_AIO_CALLS
+#endif /* ACE_AIX_VERS >= 403 */
+
 #define ACE_HAS_AIX_HI_RES_TIMER
 #define ACE_HAS_ALLOCA