ChangeLogTag:Wed Jun 16 15:02:39 2004 Steve Huston <shuston@riverace.com>

29 files changed, 92 insertions, 21 deletions

diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp
index 77275f03568..9a503798816 100644
--- a/ACEXML/common/SAXExceptions.cpp
+++ b/ACEXML/common/SAXExceptions.cpp
@@ -3,6 +3,7 @@
 #include "ACEXML/common/SAXExceptions.h"
 #include "ace/Log_Msg.h"
 #include "ace/ACE.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
 const ACEXML_Char *ACEXML_SAXException::exception_name_ = ACE_TEXT ("ACEXML_SAXException");
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index 3bbf40da0d9..c423fbe7b5a 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -10,7 +10,9 @@ ACE_RCSID(common, ACEXML_URL_Addr, "$Id$")
 
 #include "ace/Log_Msg.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 
 ACEXML_URL_Addr::ACEXML_URL_Addr (void)
diff --git a/ChangeLog b/ChangeLog
index 5958ea45e64..1d8ca6444a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+Wed Jun 16 15:02:39 2004  Steve Huston  <shuston@riverace.com>
+
+	* ace/Asynch_Acceptor.cpp:
+	* ace/Get_Opt.cpp:
+	* ace/MEM_Acceptor.cpp:
+	* ace/SOCK_SEQPACK_Acceptor.cpp:
+	* ace/SOCK_SEQPACK_Association.cpp:
+	& ace/SOCK_SEQPACK_Connector.cpp:
+	* ACEXML/common/SAXExceptions.cpp:
+	* ACEXML/common/URL_Addr.cpp:
+	* examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+	* examples/C++NPv2/display_logfile.cpp:
+	* examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+	* examples/IPC_SAP/TLI_SAP/ftp-client.cpp:
+	* examples/Logger/Acceptor-server/server_loggerd.cpp:
+	* examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp:
+	* examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp:
+	* examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp:
+	* examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp:
+	* examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp:
+	* examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp:
+	* examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp:
+	* examples/Synch/proc_sema.cpp:
+	* netsvcs/lib/Client_Logging_Handler.cpp:
+	* performance-tests/Misc/basic_perf.cpp:
+	* performance-tests/TCP/tcp_test.cpp:
+	* performance-tests/UDP/udp_test.cpp: Added missing #include
+	  directives to fix compile errors on AIX Visual Age C++.
+
+	* ace/Flag_Manip.h: Added #include "ace/os_include/os_fcntl.h" to
+	  make the values for ACE_Flag_Manip available to callers.
+
+	* ace/POSIX_Proactor.cpp:
+	* ace/POSIX_Asynch_IO.cpp: Added #include "ace/Flag_Manip.h" and
+	  changed ACE::set_flags() to ACE_Flag_Manip::set_flags().
+
+	* Kokyu/DSRT_Dispatcher_Impl_T.h: Added #includes to pick up needed
+	  declarations for ACE_SYNCH_RECURSIVE_MUTEX.
+
 Wed Jun 16 07:18:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* configure.ac:
diff --git a/Kokyu/DSRT_Dispatcher_Impl_T.h b/Kokyu/DSRT_Dispatcher_Impl_T.h
index 232d6069f10..e0883487bc6 100644
--- a/Kokyu/DSRT_Dispatcher_Impl_T.h
+++ b/Kokyu/DSRT_Dispatcher_Impl_T.h
@@ -9,6 +9,14 @@
 #ifndef DSRT_DISPATCHER_IMPL_H
 #define DSRT_DISPATCHER_IMPL_H
 #include /**/ "ace/pre.h"
+
+#include "ace/Synch_Traits.h"
+#if defined (ACE_HAS_THREADS)
+#  include "ace/Recursive_Thread_Mutex.h"
+#else
+#  include "ace/Null_Mutex.h"
+#endif /* ACE_HAS_THREADS */
+
 #include "Kokyu_dsrt.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index f0de9f9dfa7..719af603aa1 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -16,6 +16,7 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$")
 // This only works on platforms that support async i/o.
 
 #include "ace/OS_Errno.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Log_Msg.h"
 #include "ace/Message_Block.h"
diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h
index 2c3622ee623..5357a798a5f 100644
--- a/ace/Flag_Manip.h
+++ b/ace/Flag_Manip.h
@@ -24,6 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Global_Macros.h"
+#include "ace/os_include/os_fcntl.h"   /* For values passed to these methods */
 
 class ACE_Export ACE_Flag_Manip
 {
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index b9f9b96bcad..e95ef4701ad 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -9,8 +9,10 @@
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
+#include "ace/OS_NS_stdlib.h"
 
 ACE_RCSID (ace,
            Get_Opt,
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index 4ab26d7e651..e2e7de19f38 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -6,6 +6,7 @@
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 224f0850b0a..d601ed0763e 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_AIO_CALLS)
 
-#include "ace/ACE.h"
+#include "ace/Flag_Manip.h"
 #include "ace/Proactor.h"
 #include "ace/Message_Block.h"
 #include "ace/INET_Addr.h"
@@ -1529,14 +1529,15 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
     }
 
   // set non blocking mode
-  if (ACE::set_flags (handle, ACE_NONBLOCK) != 0)
+  if (ACE_Flag_Manip::set_flags (handle, ACE_NONBLOCK) != 0)
     {
       result->set_error (errno);
 
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT("%N:%l:ACE_POSIX_Asynch_Connect::connect_i: ")
-                         ACE_LIB_TEXT(" ACE::set_flags failed\n")),
-                        -1);
+      ACE_ERROR_RETURN
+        ((LM_ERROR,
+          ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i, %p\n")
+          ACE_LIB_TEXT("ACE_Flag_Manip::set_flags failed")),
+         -1);
     }
 
   for (;;)
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 2e809ec9eba..72004069c8e 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -14,6 +14,7 @@
 # endif /* ACE_HAS_SYS_INFO */
 
 #include "ace/ACE.h"
+#include "ace/Flag_Manip.h"
 #include "ace/Task_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager.h"
@@ -649,7 +650,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
   this->pipe_.open ();
 
   // Set write side in NONBLOCK mode
-  ACE::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
+  ACE_Flag_Manip::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
 
   // Let AIOCB_Proactor know about our handle
   posix_aiocb_proactor_->set_notify_handle (this->pipe_.read_handle ());
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index dd83e92e367..8744185f52e 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_fcntl.h"
@@ -343,8 +344,8 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
           // representations of the primary and secondary
           // addresses.
           sockaddr_in*  local_inet_addrs = 0;
-          ACE_NEW_NORETURN(local_inet_addrs,
-                           sockaddr_in[num_addresses]);
+          ACE_NEW_NORETURN (local_inet_addrs,
+                            sockaddr_in[num_addresses]);
 
           if (!local_inet_addrs)
             error = 1;
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index a473ae54b9d..89fa0ba95eb 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
@@ -130,9 +131,7 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz
   // an ACE_Auto_Array_Ptr.)
   {
     sockaddr_in *addr_structs_bootstrap = 0;
-    ACE_NEW_RETURN(addr_structs_bootstrap,
-                   sockaddr_in[size],
-                   -1);
+    ACE_NEW_RETURN (addr_structs_bootstrap, sockaddr_in[size], -1);
     addr_structs.reset(addr_structs_bootstrap);
   }
 
@@ -267,9 +266,7 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si
   // an ACE_Auto_Array_Ptr.)
   {
     sockaddr_in *addr_structs_bootstrap = 0;
-    ACE_NEW_RETURN(addr_structs_bootstrap,
-                   sockaddr_in[size],
-                   -1);
+    ACE_NEW_RETURN (addr_structs_bootstrap, sockaddr_in[size], -1);
     addr_structs.reset(addr_structs_bootstrap);
   }
 
diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp
index d8f35d79360..3db27f24e26 100644
--- a/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ace/SOCK_SEQPACK_Connector.cpp
@@ -5,6 +5,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/Log_Msg.h"
 #include "ace/Time_Value.h"
+#include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_fcntl.h"
@@ -133,8 +134,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
       // representations of the primary and secondary
       // addresses.
       sockaddr_in*  local_inet_addrs = 0;
-      ACE_NEW_NORETURN(local_inet_addrs,
-                       sockaddr_in[num_addresses]);
+      ACE_NEW_NORETURN (local_inet_addrs, sockaddr_in[num_addresses]);
       if (!local_inet_addrs)
         return -1;
 
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index 7ae29af9a73..b1cce5a481d 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -7,6 +7,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Process_Manager.h"
 #include "ace/Signal.h"
+#include "ace/OS_NS_string.h"
 #include "ace/os_include/os_fcntl.h"
 
 #include "Process_Per_Connection_Logging_Server.h"
diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp
index 5ca43a2c49a..10982ea7344 100644
--- a/examples/C++NPv2/display_logfile.cpp
+++ b/examples/C++NPv2/display_logfile.cpp
@@ -4,6 +4,7 @@
 ** Copyright 2002 Addison Wesley. All Rights Reserved.
 */
 
+#include "ace/ACE.h"
 #include "ace/CDR_Stream.h"
 #include "ace/FILE_Addr.h"
 #include "ace/FILE_Connector.h"
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
index 86f64df29c7..e3d070c543d 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/TLI_Connector.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 33c86e85d11..434428d4909 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -6,6 +6,7 @@
 // ACE_Reactor, ACE_Acceptor, ACE_Singleton, and the ACE_Test_and_Set
 // components.
 
+#include "ace/OS_NS_string.h"
 #include "ace/Get_Opt.h"
 #include "ace/Acceptor.h"
 #include "ace/Null_Mutex.h"
diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
index 0599c02de79..6a2c63a9bf2 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
@@ -9,6 +9,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
index d88eb669303..21927ac91a0 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
@@ -8,6 +8,7 @@
 #include "ace/FIFO_Send_Msg.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_stropts.h"
 
 ACE_RCSID(client, local_fifo_client_test, "$Id$")
diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
index 16d5c713b1a..5d45f88fec3 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
@@ -9,6 +9,7 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(client, local_pipe_client_test, "$Id$")
diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
index 7643a8ee32d..e2960590edf 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
@@ -6,6 +6,7 @@
 #include "ace/LSOCK_Connector.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
index eaba657ead2..cee8ca1469f 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
@@ -3,6 +3,7 @@
 // Test program for the INET IPC-SAPs...
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SOCK_Connector.h"
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
index 00bb6e70170..18c6b567b17 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
@@ -3,6 +3,7 @@
 // Test program for the INET IPC-SAPs...
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Mem_Map.h"
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
index d6f6f87dbb4..9753fd4a2ca 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Handle_L_Pipe.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(server, Handle_L_Pipe, "$Id$")
@@ -13,8 +14,8 @@ char *
 Handle_L_Pipe::upper_case (char s[], int n)
 {
   while (--n >= 0)
-    if (islower (s[n]))
-      s[n] = toupper (s[n]);
+    if (ACE_OS::ace_islower (s[n]))
+      s[n] = ACE_OS::to_upper (s[n]);
 
   return s;
 } 
diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp
index 0456764973e..d9da687ca6a 100644
--- a/examples/Synch/proc_sema.cpp
+++ b/examples/Synch/proc_sema.cpp
@@ -4,6 +4,7 @@
 #include "ace/Process_Semaphore.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Synch_Traits.h"
 
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 3fab8d2be3f..8861c5f7dfc 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -10,6 +10,7 @@
 #include "Client_Logging_Handler.h"
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp
index a6dce2c6fb1..c34adbceb9c 100644
--- a/performance-tests/Misc/basic_perf.cpp
+++ b/performance-tests/Misc/basic_perf.cpp
@@ -24,6 +24,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_sys_utsname.h"
 
 ACE_RCSID(Misc, basic_perf, "$Id$")
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index e8e4daac30d..182914e14b7 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -33,6 +33,7 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_arpa_inet.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -650,7 +651,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_INET_Addr remote_addr;
 
-  if (isdigit(argv[getopt.opt_ind ()][0]))
+  if (ACE_OS::ace_isdigit(argv[getopt.opt_ind ()][0]))
     {
       if (remote_addr.set (dstport,
                            (ACE_UINT32) ACE_OS::inet_addr
diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp
index 93b86f8385c..449c998f3ae 100644
--- a/performance-tests/UDP/udp_test.cpp
+++ b/performance-tests/UDP/udp_test.cpp
@@ -25,6 +25,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_arpa_inet.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
@@ -720,7 +721,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                           1);
       ACE_INET_Addr remote_addr;
 
-      if (isdigit(argv[getopt.opt_ind ()][0]))
+      if (ACE_OS::ace_isdigit(argv[getopt.opt_ind ()][0]))
         {
           if (remote_addr.set (dstport,
                                (ACE_UINT32) ACE_OS::inet_addr