Removed Windows CE support

11 files changed, 5 insertions, 48 deletions

diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index ca175391239..06f3f6b3dee 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -11,13 +11,11 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("register_handler")));
 
-#ifndef ACE_HAS_WINCE
   if (this->shutdown_.register_handler (SIGTERM,
                                         this) == -1)
     ORBSVCS_ERROR ((LM_ERROR,
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("register_handler")));
-#endif  // ACE_HAS_WINCE
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index a7b0e2bf5f0..50fa3272b9f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -26,11 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //////////////////////
 
 // compare the DFS finish times of two task entries, order higher time *first*
-#if defined (ACE_HAS_WINCE)
-int _cdecl compare_entry_finish_times (const void *first, const void *second)
-#else
 extern "C" int compare_entry_finish_times (const void *first, const void *second)
-#endif  // ACE_HAS_WINCE
 {
   // sort blank entries to the end
   if (! first)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 74e5d01c316..9421340692f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -15,15 +15,11 @@
 // Helper function type definition for sort //
 //////////////////////////////////////////////
 
-#if defined (ACE_HAS_WINCE)
-typedef int (_cdecl* COMP_FUNC) (const void*, const void*);
-#else
 // This is awkward, but it makes MSVC++ happy.
 extern "C"
 {
 typedef int (*COMP_FUNC) (const void*, const void*);
 }
-#endif  // ACE_HAS_WINCE
 
 ///////////////////////////////////////////////////
 // class ACE_Strategy_Scheduler member functions //
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 9f25a876c4a..fcdd9eaa8ed 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -244,11 +244,7 @@ protected:
 
 private:
     // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
-#if defined (ACE_HAS_WINCE)
-  static int _cdecl sort_function (void *arg1, void *arg2);
-#else
   static int sort_function (void *arg1, void *arg2);
-#endif  // ACE_HAS_WINCE
 
     /// Instance of the strategy.
   static ACE_MUF_Scheduler_Strategy *instance_;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index 6a0904281cf..e08ad3c0a52 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -35,13 +35,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_WINCE)
-// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
-// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0.
-# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log")
-# define ACE_LOG_DIRECTORY           ACE_TEXT ("\\log\\")
-# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\")
 # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\")
 # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
@@ -57,11 +51,11 @@
 
 #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log")
 
-#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP)
 size_t const ACE_MAX_CLIENTS = 4;
 #else
 size_t const ACE_MAX_CLIENTS = 30;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_PHARLAP */
 
 size_t const ACE_NS_MAX_ENTRIES = 1000;
 size_t const ACE_DEFAULT_USECS = 1000;
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 72a37aaaea1..7a4f1bca094 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -454,7 +454,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl () const
 
 #if defined(ACE_WIN32) \
   && !defined (ACE_LACKS_MSG_WFMO) \
-  && !defined (ACE_HAS_WINCE)      \
   && !defined (ACE_HAS_PHARLAP)
     case TAO_REACTOR_MSGWFMO:
       ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor (0, tmq.get ()), 0);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index f8aa2c5beec..c4df7669a0d 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -152,8 +152,6 @@ CORBA::SystemException::_tao_errno (int errno_value)
       return TAO_ECONNREFUSED_MINOR_CODE;
     case ENOENT:
       return TAO_ENOENT_MINOR_CODE;
-
-#if !defined (ACE_HAS_WINCE)
     case EMFILE:
       return TAO_EMFILE_MINOR_CODE;
     case EBADF:
@@ -162,8 +160,6 @@ CORBA::SystemException::_tao_errno (int errno_value)
       return TAO_EPERM_MINOR_CODE;
     case EINVAL:
       return TAO_EINVAL_MINOR_CODE;
-#endif  // ACE_HAS_WINCE
-
 #if (ENOSYS != EFAULT)
     case ENOSYS:
       return TAO_ENOSYS_MINOR_CODE;
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index fe76c2aec9b..9c6c32cfbc7 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -964,7 +964,7 @@ namespace
     // NOTE: When adding new global arguments, ensure they are only
     // applied when apply_values is true, but that they are always
     // consumed, if they need to be consumed.
-#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
+#if defined (TAO_DEBUG)
     // Make it a little easier to debug programs using this code.
     if (apply_values)
       {
@@ -982,7 +982,7 @@ namespace
                         TAO_debug_level));
           }
       }
-#endif  /* TAO_DEBUG && !ACE_HAS_WINCE */
+#endif  /* TAO_DEBUG */
 
     // Extract the Service Configurator ORB options from the argument
     // vector.