ChangeLogTag: Thu May 4 08:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 17 insertions, 33 deletions

diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index 9eda6e877a5..98ba0473a40 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -36,11 +36,7 @@
 // Run the thread entry point for the ACE_Thread_Adapter.  This must
 // be an extern "C" to make certain compilers happy...
 
-#if defined (ACE_PSOS)
-extern "C" void ACE_THREAD_ADAPTER_NAME (unsigned long args);
-#else /* ! defined (ACE_PSOS) */
 extern "C" ACE_Export ACE_THR_FUNC_RETURN ACE_THREAD_ADAPTER_NAME (void *args);
-#endif /* ACE_PSOS */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 7c37f4bbbf0..eb0bedb5f15 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -184,7 +184,7 @@ public:
 #   elif defined(__TANDEM)
       typedef long long LongLong;
 #   elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
-#     if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC)
+#     if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
               // sun #defines   u_longlong_t, maybe other platforms do also.
               // Use it, at least with g++, so that its -pedantic doesn't
               // complain about no ANSI C++ long long.
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 3b76da06460..6528483e344 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -231,7 +231,7 @@ ACE_Handle_Set::set_max (ACE_HANDLE current_max)
            maskp[i] == 0;
            i--)
         continue;
-#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+#if defined (ACE_TANDEM_NSK_BIT_ORDER)
       // bits are in reverse order, MSB (sign bit) = bit 0.
       this->max_handle_ = ACE_MULT_BY_WORDSIZE (i);
       for (fd_mask val = maskp[i];
@@ -317,12 +317,12 @@ ACE_Handle_Set_Iterator::operator () (void)
       // Increment the iterator and advance to the next bit in this
       // word.
       this->handle_index_++;
-#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+#if defined (ACE_TANDEM_NSK_BIT_ORDER)
       // bits are in reverse order, MSB (sign bit) = bit 0.
       this->word_val_ = (this->word_val_ << 1);
 #  else
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_PSOS */
+#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 
       // If we've examined all the bits in this word, we'll go onto
       // the next word.
@@ -359,7 +359,7 @@ ACE_Handle_Set_Iterator::operator () (void)
       // represents (this information is used by subsequent calls to
       // <operator()>).
 
-#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+#if defined (ACE_TANDEM_NSK_BIT_ORDER)
       // bits are in reverse order, MSB (sign bit) = bit 0.
       for (;
            this->word_val_ > 0;
@@ -370,7 +370,7 @@ ACE_Handle_Set_Iterator::operator () (void)
            ACE_BIT_DISABLED (this->word_val_, 1);
            this->handle_index_++)
         this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_PSOS */
+#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 
       return result;
     }
@@ -479,7 +479,7 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+#if defined (ACE_TANDEM_NSK_BIT_ORDER)
     // bits are in reverse order, MSB (sign bit) = bit 0.
     for (this->word_val_ = maskp[this->word_num_];
          this->word_val_ > 0;
@@ -491,7 +491,7 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
            && this->handle_index_ < maxhandlep1;
          this->handle_index_++)
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_PSOS */
+#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 #elif !defined (ACE_WIN32) && defined (ACE_HAS_BIG_FD_SET)
     if (this->word_max_==0)
       {
@@ -547,7 +547,7 @@ ACE_Handle_Set_Iterator::reset_state (void)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+#if defined (ACE_TANDEM_NSK_BIT_ORDER)
     // bits are in reverse order, MSB (sign bit) = bit 0.
     for (this->word_val_ = maskp[this->word_num_];
          this->word_val_ > 0;
@@ -559,7 +559,7 @@ ACE_Handle_Set_Iterator::reset_state (void)
            && this->handle_index_ < maxhandlep1;
          this->handle_index_++)
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_PSOS */
+#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 #elif !defined (ACE_WIN32) && defined (ACE_HAS_BIG_FD_SET)
     if (this->word_max_==0)
       {
diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h
index f70555a74da..66562c41876 100644
--- a/ace/Malloc_Allocator.h
+++ b/ace/Malloc_Allocator.h
@@ -92,7 +92,7 @@ private:
  * time <malloc>/<calloc> is called, it simply moves an internal
  * index forward and returns a pointer to the requested chunk.
  * All memory is allocated statically (typically via the
- * <ACE_Static_Allocator> template) and <free> is a no-op.  This
+ * ACE_Static_Allocator template) and <free> is a no-op.  This
  * behavior is useful for use-cases where all the memory
  * allocation needs are known in advance and no deletions ever
  * occur.
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 5c4a04c5397..dc0c925fe02 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -89,7 +89,7 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
   int inlen;
 
   if (ACE_OS::ioctl (this->get_handle (),
-                     FIONREAD, 
+                     FIONREAD,
 		     &inlen) == -1)
     return -1;
   else if (inlen > 0)
@@ -616,12 +616,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
 #else
       ifreq if_address;
 
-#if defined (ACE_PSOS)
-      // Look up the interface by number, not name.
-      if_address.ifr_ifno = ACE_OS::atoi (net_if);
-#else
       ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if));
-#endif /* defined (ACE_PSOS) */
 
       if (ACE_OS::ioctl (this->get_handle (),
                          SIOCGIFADDR,
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index c7c9a0c10dc..e21388e7bae 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -62,9 +62,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
 {
   ACE_TRACE ("ACE_SPIPE_Connector::connect");
   // Make darn sure that the O_CREAT flag is not set!
-#if ! defined (ACE_PSOS_DIAB_MIPS)
   ACE_CLR_BITS (flags, O_CREAT);
-# endif /* !ACE_PSOS_DIAB_MIPS */
 
   ACE_HANDLE handle;
 
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 4321bf4fb31..6d6d5b8e5a6 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -784,13 +784,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_error (void)
   else
     return this->check_handles ();
 #else
-#  if defined (ACE_PSOS)
-  else if (errno == EBADS)
-    return this->check_handles ();
-#  else
   else if (errno == EBADF)
     return this->check_handles ();
-#  endif /* ACE_PSOS */
   else
     return -1;
 #endif  /* __MVS__ || ACE_WIN32 */
@@ -1450,10 +1445,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::check_handles");
 
-#if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_PSOS) || defined (VXWORKS)
+#if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_VXWORKS)
   ACE_Time_Value time_poll = ACE_Time_Value::zero;
   ACE_Handle_Set rd_mask;
-#endif /* ACE_WIN32 || MVS || ACE_PSOS || VXWORKS */
+#endif /* ACE_WIN32 || MVS || ACE_VXWORKS */
 
   int result = 0;
 
@@ -1477,7 +1472,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
   while ((h = check_iter ()) != ACE_INVALID_HANDLE)
     {
 
-#if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_PSOS) || defined (VXWORKS)
+#if defined (ACE_WIN32) || defined (__MVS__) || defined (VXWORKS)
       // Win32 needs to do the check this way because fstat won't work on
       // a socket handle.  MVS Open Edition needs to do it this way because,
       // even though the docs say to check a handle with either select or
@@ -1504,7 +1499,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
         }
       rd_mask.clr_bit (h);
-#else /* !ACE_WIN32 && !MVS && !ACE_PSOS && !VXWORKS */
+#else /* !ACE_WIN32 && !MVS && !VXWORKS */
       struct stat temp;
 
       if (ACE_OS::fstat (h, &temp) == -1)
@@ -1512,7 +1507,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
           result = 1;
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
         }
-#endif /* ACE_WIN32 || MVS || ACE_PSOS */
+#endif /* ACE_WIN32 || MVS */
     }
 
   return result;