ChangeLogTag:Sun Oct 21 12:50:39 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

12 files changed, 28 insertions, 31 deletions

diff --git a/ace/ACE.h b/ace/ACE.h
index 4870720b150..4765f1f83b9 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -444,8 +444,6 @@ public:
                         int close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES,
                         const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("<unknown>"));
 
-  // = Shield us from Win32's inability to select on STDIN.
-
   // = Miscelleous functions.
   /// Rounds the request to a multiple of the page size.
   static size_t round_to_pagesize (off_t length);
diff --git a/ace/Connector.h b/ace/Connector.h
index 1b568eff70a..5cfb4cb2945 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_CONNECTOR_H
 #define ACE_CONNECTOR_H
 #include "ace/pre.h"
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 81c9a6006dd..bb3ee3453d6 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -156,7 +156,7 @@ public:
 
   /**
    * Abstracts away from the differences between Win32 and ACE with
-   * respect to reading from ACE_STDIN (which is non-<select>'able on
+   * respect to reading from ACE_STDIN, which is non-<select>'able on
    * Win32.
    */
   static int register_stdin_handler (ACE_Event_Handler *eh,
diff --git a/ace/Future.h b/ace/Future.h
index 7027444b8a3..58f30cdf60a 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -8,8 +8,8 @@
  *
  *  @author Andres Kruse <Andres.Kruse@cern.ch>
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- *  @author Per Andersson <Per.Andersson@hfera.ericsson.se>
- *  @author and John Tucker <jtucker@infoglide.com>
+ *  @author Per Andersson <Per.Andersson@hfera.ericsson.se> and
+ *  @author John Tucker <jtucker@infoglide.com>
  */
 //=============================================================================
 
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index 17bda22c188..b79241dfa14 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_FUTURE_SET_H
 #define ACE_FUTURE_SET_H
 #include "ace/pre.h"
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index c5f7309ead7..427d2117f06 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -30,7 +30,7 @@ int
 ACE_LSOCK::send_handle (const ACE_HANDLE handle) const
 {
   ACE_TRACE ("ACE_LSOCK::send_handle");
-  unsigned char a[2];
+  u_char a[2];
   iovec iov;
   msghdr send_msg;
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
@@ -71,7 +71,7 @@ int
 ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, int *len) const
 {
   ACE_TRACE ("ACE_LSOCK::recv_handle");
-  unsigned char a[2];
+  u_char a[2];
   iovec iov;
   msghdr recv_msg;
 
@@ -103,9 +103,6 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, int *len) const
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
 #if defined (ACE_HAS_STREAMS)
-#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
-  ACE_UNUSED_ARG (handle);
-#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
   ssize_t nbytes = ACE_OS::recvmsg (this->get_handle (), &recv_msg, 0);
 
@@ -115,9 +112,15 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, int *len) const
         *len = nbytes;
 
       if (nbytes == sizeof a
-          && ((unsigned char *) iov.iov_base)[0] == 0xab
-          && ((unsigned char *) iov.iov_base)[1] == 0xcd)
-        return 1;
+          && ((u_char *) iov.iov_base)[0] == 0xab
+          && ((u_char *) iov.iov_base)[1] == 0xcd)
+        {
+#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
+          cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
+          handle = *(ACE_HANDLE *) CMSG_DATA (cmsgptr);
+#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
+          return 1;
+        }
       else
         return 0;
     }
@@ -129,8 +132,8 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, int *len) const
   if (nbytes != ACE_INVALID_HANDLE)
     {
       if (nbytes == sizeof a
-          && ((unsigned char *) iov.iov_base)[0] == 0xab
-          && ((unsigned char *) iov.iov_base)[1] == 0xcd)
+          && ((u_char *) iov.iov_base)[0] == 0xab
+          && ((u_char *) iov.iov_base)[1] == 0xcd)
         {
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
           // Close down the socket that was returned by the MSG_PEEK.
@@ -149,7 +152,7 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, int *len) const
             {
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
               cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
-              handle = *(ACE_HANDLE *) CMSG_DATA (cmsgptr) ;
+              handle = *(ACE_HANDLE *) CMSG_DATA (cmsgptr);
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
               return 1;
             }
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index 16c6074c595..fc52e0ff6f4 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -232,7 +232,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (size_t tabl
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (FUNCTOR *upcall_functor,
-                                                                 ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
+                                                                     ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
   : ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> (upcall_functor, freelist),
     size_ (0),
     table_ (new BUCKET *[ACE_DEFAULT_TIMER_HASH_TABLE_SIZE]),
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 8e7ddc739f1..36efdb169d5 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_TIMER_HASH_T_H
 #define ACE_TIMER_HASH_T_H
 #include "ace/pre.h"
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index aa96a1b6e9a..6039225e797 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_TIMER_HEAP_T_H
 #define ACE_TIMER_HEAP_T_H
 #include "ace/pre.h"
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index 0a5c19bb81d..a863ce39a3c 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_TIMER_LIST_T_H
 #define ACE_TIMER_LIST_T_H
 #include "ace/pre.h"
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index 1cf85b7dcae..75919a148c5 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -207,7 +207,7 @@ extern "C" { char * cuserid (char *s); }
 #define ACE_HAS_SOCKLEN_T
 #endif
 
-#if (__FreeBSD_version > 430000)
+#if (__FreeBSD_version > 440000)
 # define _P1003_1B_VISIBLE
 # define ACE_HAS_AIO_CALLS
 # define SIGRTMIN 32
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 466294e5640..68f88090490 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -1,11 +1,12 @@
 /* -*- C++ -*- */
 // $Id$
 
-// This configuration file is designed to be included by another,
-// specific configuration file.  It provides config information common
-// to all Linux platforms.  It automatically determines the CPU
-// architecture, compiler (g++ or egcs), and libc (libc5 or glibc),
-// and configures based on those.
+// Do not use this configuration file directly since it's designed to
+// be included by another, specific configuration file, such as
+// config-linux.h.  It provides config information common to all Linux
+// platforms.  It automatically determines the CPU architecture,
+// compiler (g++ or egcs), and libc (libc5 or glibc), and configures
+// based on those.
 
 #ifndef ACE_LINUX_COMMON_H
 #define ACE_LINUX_COMMON_H