diff options
37 files changed, 2820 insertions, 1202 deletions
diff --git a/ChangeLog b/ChangeLog index ae5be552dd5..4f8d3b5b7b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,142 @@ +Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_ce.dsw: (removed) + * ace/ace_dll_ce.dsp: (removed) + * ace/ace.vcw: (added) + * ace/ace_dll.vcp: (added) + * ace/ace_os_dll.vcp: (added) + + Removed the old Windows CE project files, and replaced + them with ones created by the eMbedded Visual C++ from + MS. + + * ace/OS_Errno.cpp: (added) + * ace/OS_Errno.h: (added) + * ace/OS_Errno.inl: (added) + * ace/config-all.h: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Moved the Errno stuff from ACE_OS to a separate class, + since it needed to be in its own layer for Windows CE. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + + Added OS_Errno.* files. + + * ace/ACE.cpp: + * ace/Sock_Connect.cpp: + + Moved get_reg_value () to Sock_Connect since that is where + it is being used. + + * ace/ARGV.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_ENV for platforms (like Windows CE) which + doesn't have an environment. Maybe in the future this can + be emulated, for now, we do nothing. + + * ace/Base_Thread_Adapter.h: + * ace/OS.h: + + Replace ACE_Export with ACE_OS_Export. + + * ace/Base_Thread_Adapter.inl: + * ace/Thread_Adapter.inl: + + Moved some of the ACE_OS_Thread_Descriptor methods to + Base_Thread_Adapter, since they were declared in + Base_Thread_Adapter.h. + + * ace/SUN_Proactor.cpp: + + Removed ACE_BUILD_DLL from this file, since it should only + be defined in the project file. + + * ace/OS_Dirent.h: + + Added ACE_WINCE to the #if block around some of the includes. + + * ace/OS_Memory.h: + * ace/OS_Dirent.inl: + * ace/OS_String.inl: + * ace/OS.h: + + Added /**/ to the #includes of pace, since they seem to + totally confuse EVC's automatic dependency generation. + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + + Added strerror. On machines without it, just returns + "Unknown Error" all the time. + + Added strspn_emulation, strpbrk_emulation, strtol_emulation, + and strtoul_emulation. + + New compile time defines: + - ACE_LACKS_STERROR + - ACE_LACKS_STRPBRK + - ACE_LACKS_STRSPN + - ACE_LACKS_STRTOL + - ACE_LACKS_STRTOUL + - ACE_LACKS_STRTOD + + * ace/Log_Msg.cpp: + + Since there is now strerror in ACE, removed the !ACE_HAS_WINCE + blocks and replaced them with direct calls to ACE_OS_String's + version. + + * ace/config-win32.h: + + Changed check for #include-ing config-wince.h to be based on + _WIN32_WCE because this definition has been automatically added + to the default projects by the misc WinCE editors. + + * ace/Service_Config.i: + + The char versions of the following fuctions (which are defined + only under WinCE) were recursive and would fail miserably if + ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate + recursion. + - ACE_Service_Config::initialize () + - ACE_Service_Config::resume () + - ACE_Service_Config::suspend () + - ACE_Service_Config::remove () + + * ace/config-win32-msvc.h: + + We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has + GNU's cstring.h, so I removed it. + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. + + Added writev and readv emulation methods to ACE_OS, since they + were just being defined as global functions. This is more + consistent with what we are doing elsewhere. + + Added ACE_LACKS_SYS_NERR emulation. + + * ace/config-WinCE.h: + + Added all the necessary defined to get ACE compiling for Windows + CE 3.0. As for previous versions, they do not currently compile, + although that could change in the future + Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> * ace/Cache_Map_Manager_T.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index ae5be552dd5..4f8d3b5b7b1 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,142 @@ +Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_ce.dsw: (removed) + * ace/ace_dll_ce.dsp: (removed) + * ace/ace.vcw: (added) + * ace/ace_dll.vcp: (added) + * ace/ace_os_dll.vcp: (added) + + Removed the old Windows CE project files, and replaced + them with ones created by the eMbedded Visual C++ from + MS. + + * ace/OS_Errno.cpp: (added) + * ace/OS_Errno.h: (added) + * ace/OS_Errno.inl: (added) + * ace/config-all.h: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Moved the Errno stuff from ACE_OS to a separate class, + since it needed to be in its own layer for Windows CE. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + + Added OS_Errno.* files. + + * ace/ACE.cpp: + * ace/Sock_Connect.cpp: + + Moved get_reg_value () to Sock_Connect since that is where + it is being used. + + * ace/ARGV.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_ENV for platforms (like Windows CE) which + doesn't have an environment. Maybe in the future this can + be emulated, for now, we do nothing. + + * ace/Base_Thread_Adapter.h: + * ace/OS.h: + + Replace ACE_Export with ACE_OS_Export. + + * ace/Base_Thread_Adapter.inl: + * ace/Thread_Adapter.inl: + + Moved some of the ACE_OS_Thread_Descriptor methods to + Base_Thread_Adapter, since they were declared in + Base_Thread_Adapter.h. + + * ace/SUN_Proactor.cpp: + + Removed ACE_BUILD_DLL from this file, since it should only + be defined in the project file. + + * ace/OS_Dirent.h: + + Added ACE_WINCE to the #if block around some of the includes. + + * ace/OS_Memory.h: + * ace/OS_Dirent.inl: + * ace/OS_String.inl: + * ace/OS.h: + + Added /**/ to the #includes of pace, since they seem to + totally confuse EVC's automatic dependency generation. + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + + Added strerror. On machines without it, just returns + "Unknown Error" all the time. + + Added strspn_emulation, strpbrk_emulation, strtol_emulation, + and strtoul_emulation. + + New compile time defines: + - ACE_LACKS_STERROR + - ACE_LACKS_STRPBRK + - ACE_LACKS_STRSPN + - ACE_LACKS_STRTOL + - ACE_LACKS_STRTOUL + - ACE_LACKS_STRTOD + + * ace/Log_Msg.cpp: + + Since there is now strerror in ACE, removed the !ACE_HAS_WINCE + blocks and replaced them with direct calls to ACE_OS_String's + version. + + * ace/config-win32.h: + + Changed check for #include-ing config-wince.h to be based on + _WIN32_WCE because this definition has been automatically added + to the default projects by the misc WinCE editors. + + * ace/Service_Config.i: + + The char versions of the following fuctions (which are defined + only under WinCE) were recursive and would fail miserably if + ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate + recursion. + - ACE_Service_Config::initialize () + - ACE_Service_Config::resume () + - ACE_Service_Config::suspend () + - ACE_Service_Config::remove () + + * ace/config-win32-msvc.h: + + We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has + GNU's cstring.h, so I removed it. + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. + + Added writev and readv emulation methods to ACE_OS, since they + were just being defined as global functions. This is more + consistent with what we are doing elsewhere. + + Added ACE_LACKS_SYS_NERR emulation. + + * ace/config-WinCE.h: + + Added all the necessary defined to get ACE compiling for Windows + CE 3.0. As for previous versions, they do not currently compile, + although that could change in the future + Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> * ace/Cache_Map_Manager_T.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index ae5be552dd5..4f8d3b5b7b1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,142 @@ +Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_ce.dsw: (removed) + * ace/ace_dll_ce.dsp: (removed) + * ace/ace.vcw: (added) + * ace/ace_dll.vcp: (added) + * ace/ace_os_dll.vcp: (added) + + Removed the old Windows CE project files, and replaced + them with ones created by the eMbedded Visual C++ from + MS. + + * ace/OS_Errno.cpp: (added) + * ace/OS_Errno.h: (added) + * ace/OS_Errno.inl: (added) + * ace/config-all.h: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Moved the Errno stuff from ACE_OS to a separate class, + since it needed to be in its own layer for Windows CE. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + + Added OS_Errno.* files. + + * ace/ACE.cpp: + * ace/Sock_Connect.cpp: + + Moved get_reg_value () to Sock_Connect since that is where + it is being used. + + * ace/ARGV.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_ENV for platforms (like Windows CE) which + doesn't have an environment. Maybe in the future this can + be emulated, for now, we do nothing. + + * ace/Base_Thread_Adapter.h: + * ace/OS.h: + + Replace ACE_Export with ACE_OS_Export. + + * ace/Base_Thread_Adapter.inl: + * ace/Thread_Adapter.inl: + + Moved some of the ACE_OS_Thread_Descriptor methods to + Base_Thread_Adapter, since they were declared in + Base_Thread_Adapter.h. + + * ace/SUN_Proactor.cpp: + + Removed ACE_BUILD_DLL from this file, since it should only + be defined in the project file. + + * ace/OS_Dirent.h: + + Added ACE_WINCE to the #if block around some of the includes. + + * ace/OS_Memory.h: + * ace/OS_Dirent.inl: + * ace/OS_String.inl: + * ace/OS.h: + + Added /**/ to the #includes of pace, since they seem to + totally confuse EVC's automatic dependency generation. + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + + Added strerror. On machines without it, just returns + "Unknown Error" all the time. + + Added strspn_emulation, strpbrk_emulation, strtol_emulation, + and strtoul_emulation. + + New compile time defines: + - ACE_LACKS_STERROR + - ACE_LACKS_STRPBRK + - ACE_LACKS_STRSPN + - ACE_LACKS_STRTOL + - ACE_LACKS_STRTOUL + - ACE_LACKS_STRTOD + + * ace/Log_Msg.cpp: + + Since there is now strerror in ACE, removed the !ACE_HAS_WINCE + blocks and replaced them with direct calls to ACE_OS_String's + version. + + * ace/config-win32.h: + + Changed check for #include-ing config-wince.h to be based on + _WIN32_WCE because this definition has been automatically added + to the default projects by the misc WinCE editors. + + * ace/Service_Config.i: + + The char versions of the following fuctions (which are defined + only under WinCE) were recursive and would fail miserably if + ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate + recursion. + - ACE_Service_Config::initialize () + - ACE_Service_Config::resume () + - ACE_Service_Config::suspend () + - ACE_Service_Config::remove () + + * ace/config-win32-msvc.h: + + We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has + GNU's cstring.h, so I removed it. + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. + + Added writev and readv emulation methods to ACE_OS, since they + were just being defined as global functions. This is more + consistent with what we are doing elsewhere. + + Added ACE_LACKS_SYS_NERR emulation. + + * ace/config-WinCE.h: + + Added all the necessary defined to get ACE compiling for Windows + CE 3.0. As for previous versions, they do not currently compile, + although that could change in the future + Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> * ace/Cache_Map_Manager_T.h: diff --git a/ace/ACE.cpp b/ace/ACE.cpp index d30f95ccb2d..ac994c6bc67 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -3064,46 +3064,6 @@ ACE::sock_error (int error) #endif /* ACE_WIN32 */ } -#if defined (ACE_WIN32) -// Return value in buffer for a key/name pair from the Windows -// Registry up to buf_len size. - -static int -get_reg_value (const ACE_TCHAR *key, - const ACE_TCHAR *name, - ACE_TCHAR *buffer, - DWORD &buf_len) -{ - HKEY hk; - DWORD buf_type; - LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE, - key, - 0, - KEY_READ, - &hk); - // 1. open key that defines the interfaces used for TCP/IP? - if (rc != ERROR_SUCCESS) - // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc); - return -1; - - rc = ACE_TEXT_RegQueryValueEx (hk, - name, - 0, - &buf_type, - (u_char *) buffer, - &buf_len); - if (rc != ERROR_SUCCESS) - { - // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); - RegCloseKey (hk); - return -2; - } - - ::RegCloseKey (hk); - return 0; -} -#endif /* ACE_WIN32 */ - char * ACE::strndup (const char *str, size_t n) { diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index 9d485da722f..1670ca7ce8f 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -100,6 +100,7 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], for (int i = 0; argv[i] != 0; i++) { +#if !defined (ACE_LACKS_ENV) ACE_TCHAR *temp; // Account for environment variables. @@ -108,6 +109,7 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], && (temp = ACE_OS::getenv (&argv[i][1])) != 0)) buf_len += ACE_OS::strlen (temp); else +#endif /* !ACE_LACKS_ENV */ buf_len += ACE_OS::strlen (argv[i]); // Add one for the extra space between each string. @@ -125,6 +127,7 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], for (j = 0; argv[j] != 0; j++) { +#if !defined (ACE_LACKS_ENV) ACE_TCHAR *temp; // Account for environment variables. @@ -133,6 +136,7 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], && (temp = ACE_OS::getenv (&argv[j][1])) != 0)) end = ACE_OS::strecpy (end, temp); else +#endif /* ACE_LACKS_ENV */ end = ACE_OS::strecpy (end, argv[j]); // Replace the null char that strecpy copies with white space as diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h index 14dca42a50b..dfa6cde0071 100644 --- a/ace/Base_Thread_Adapter.h +++ b/ace/Base_Thread_Adapter.h @@ -27,7 +27,7 @@ #if defined (ACE_PSOS) extern "C" void ace_thread_adapter (unsigned long args); #else /* ! defined (ACE_PSOS) */ -extern "C" ACE_Export void *ace_thread_adapter (void *args); +extern "C" ACE_OS_Export void *ace_thread_adapter (void *args); #endif /* ACE_PSOS */ /** diff --git a/ace/Base_Thread_Adapter.inl b/ace/Base_Thread_Adapter.inl index d20344e90cc..01187486eca 100644 --- a/ace/Base_Thread_Adapter.inl +++ b/ace/Base_Thread_Adapter.inl @@ -1,5 +1,18 @@ // $Id$ +ACE_INLINE long +ACE_OS_Thread_Descriptor::flags (void) const +{ + return flags_; +} + + +ACE_INLINE +ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags) + : flags_ (flags) +{ +} + ACE_INLINE void ACE_Base_Thread_Adapter::set_log_msg_hooks ( ACE_INIT_LOG_MSG_HOOK init_hook, diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 430864ecc37..7a82d8eb143 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -871,15 +871,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { type = SKIP_SPRINTF; errno = ACE::map_errno (this->errnum ()); -#if !defined (ACE_HAS_WINCE) - // @@ WINCE There is no strerror available on CE. - // Have to double check if this change is valid. if (errno >= 0 && errno < sys_nerr) ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s: %s"), va_arg (argp, ACE_TCHAR *), - strerror (errno)); + ACE_OS_String::strerror (errno)); else -#endif /* ACE_HAS_WINCE */ { #if defined (ACE_WIN32) ACE_TCHAR *lpMsgBuf = 0; @@ -935,15 +931,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { type = SKIP_SPRINTF; errno = ACE::map_errno (this->errnum ()); -#if !defined (ACE_HAS_WINCE) - // @@ There is no strerror available on CE. - // Have to double check if this change is valid. if (errno >= 0 && errno < sys_nerr) ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s"), - strerror (errno)); + ACE_OS_String::strerror (errno)); else -#endif /* ACE_HAS_WINCE */ { #if defined (ACE_WIN32) ACE_TCHAR *lpMsgBuf = 0; diff --git a/ace/Makefile b/ace/Makefile index 1923d3f6e1e..b7671366ca9 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -15,6 +15,7 @@ OS_FILES = \ OS_Memory \ OS_String \ OS_TLI \ + OS_Errno \ Base_Thread_Adapter \ OS_Thread_Adapter \ OS_Log_Msg_Attributes \ diff --git a/ace/Makefile.am b/ace/Makefile.am index 3f2c76f5d4f..786a95c622c 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -135,6 +135,7 @@ libACE_OS_la_SOURCES = \ Basic_Types.cpp \ OS.cpp \ OS_Dirent.cpp \ + OS_Errno.cpp \ OS_Memory.cpp \ OS_String.cpp \ OS_TLI.cpp \ @@ -628,6 +629,7 @@ HEADER_FILES = \ Naming_Context.h \ OS.h \ OS_Dirent.h \ + OS_Errno.h \ OS_Export.h \ OS_Log_Msg_Attributes.h \ OS_Memory.h \ @@ -967,6 +969,7 @@ INLINE_FILES = \ CDR_Base.inl \ File_Lock.inl \ OS_Dirent.inl \ + OS_Errno.inl \ OS_Log_Msg_Attributes.inl \ OS_Memory.inl \ OS_String.inl \ diff --git a/ace/Makefile.bor b/ace/Makefile.bor index 22bd901967f..14020664e14 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -110,6 +110,7 @@ OBJFILES = \ $(OBJDIR)\Obstack.obj \ $(OBJDIR)\OS.obj \ $(OBJDIR)\OS_Dirent.obj \ + $(OBJDIR)\OS_Errno.obj \ $(OBJDIR)\OS_Log_Msg_Attributes.obj \ $(OBJDIR)\OS_Memory.obj \ $(OBJDIR)\OS_String.obj \ diff --git a/ace/OS.cpp b/ace/OS.cpp index b2ee27bd9fc..9d5d3a52a5f 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -670,7 +670,12 @@ ACE_OS::uname (struct utsname *name) ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("???")); } +# if defined (ACE_LACKS_HOSTNAME) + return 0; +# else /* ACE_LACKS_HOSTNAME */ return ACE_OS::hostname (name->nodename, maxnamelen); +# endif /* ACE_LACKS_HOSTNAME */ + # elif defined (VXWORKS) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "VxWorks"); @@ -4115,12 +4120,14 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, { ACE_TCHAR *temp = 0; +#if !defined (ACE_LACKS_ENV) // Account for environment variables. if (substitute_env_args && (argv[i][0] == '$' && (temp = ACE_OS::getenv (&argv[i][1])) != 0)) buf_len += ACE_OS::strlen (temp); else +#endif /* ACE_LACKS_ENV */ buf_len += ACE_OS::strlen (argv[i]); // Add one for the extra space between each string. @@ -4143,12 +4150,14 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, { ACE_TCHAR *temp = 0; +# if !defined (ACE_LACKS_ENV) // Account for environment variables. if (substitute_env_args && (argv[j][0] == '$' && (temp = ACE_OS::getenv (&argv[j][1])) != 0)) end = ACE_OS::strecpy (end, temp); else +#endif /* ACE_LACKS_ENV */ end = ACE_OS::strecpy (end, argv[j]); // Replace the null char that strecpy put there with white @@ -4279,12 +4288,14 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, *cp = '\0'; } +#if !defined (ACE_LACKS_ENV) // Check for environment variable substitution here. if (substitute_env_args) ACE_ALLOCATOR_RETURN (argv[i], ACE_OS::strenvdup (arg), -1); else +#endif /* ACE_LACKS_ENV */ ACE_ALLOCATOR_RETURN (argv[i], ACE_OS::strdup (arg), -1); @@ -4436,8 +4447,8 @@ ACE_OS::write_n (ACE_HANDLE handle, // "Fake" writev for operating systems without it. Note that this is // thread-safe. -extern "C" int -writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n) +int +ACE_OS::writev_emulation (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n) { ACE_OS_TRACE ("::writev"); @@ -4482,10 +4493,10 @@ writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n) // "Fake" readv for operating systems without it. Note that this is // thread-safe. -extern "C" int -readv (ACE_HANDLE handle, - ACE_READV_TYPE *iov, - int n) +int +ACE_OS::readv_emulation (ACE_HANDLE handle, + ACE_READV_TYPE *iov, + int n) { ACE_OS_TRACE ("readv"); @@ -5233,12 +5244,21 @@ ACE_OS::open (const char *filename, shared_mode |= FILE_SHARE_DELETE; #endif /* ACE_HAS_WINCE */ +#if defined (ACE_HAS_WINCE) + ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (), access, + shared_mode, + ACE_OS::default_win32_security_attributes (sa), + creation, + flags, + 0); +#else /* ACE_HAS_WINCE */ ACE_HANDLE h = ::CreateFileA (filename, access, shared_mode, ACE_OS::default_win32_security_attributes (sa), creation, flags, 0); +#endif /* ACE_HAS_WINCE */ if (ACE_BIT_ENABLED (mode, _O_APPEND)) { @@ -6938,7 +6958,7 @@ ACE_OS_Object_Manager::shutting_down (void) } #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) -class ACE_Export ACE_OS_Object_Manager_Manager +class ACE_OS_Object_Manager_Manager // = TITLE // Ensure that the <ACE_OS_Object_Manager> gets initialized at // program startup, and destroyed at program termination. @@ -6984,26 +7004,6 @@ static ACE_OS_Object_Manager_Manager ACE_OS_Object_Manager_Manager_instance; #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */ # if defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -ACE_CE_Errno *ACE_CE_Errno::instance_ = 0; -DWORD ACE_CE_Errno::errno_key_ = 0xffffffff; - -void -ACE_CE_Errno::init () -{ - ACE_CE_Errno::instance_ = new ACE_CE_Errno (); - ACE_CE_Errno::errno_key_ = TlsAlloc (); -} - -void -ACE_CE_Errno::fini () -{ - TlsFree (ACE_CE_Errno::errno_key_); - delete ACE_CE_Errno::instance_; - ACE_CE_Errno::instance_ = 0; -} -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - ACE_CE_Bridge *ACE_CE_Bridge::default_text_bridge_ = 0; ACE_CE_Bridge::ACE_CE_Bridge (void) @@ -7120,6 +7120,7 @@ exit (int status) #undef GetEnvironmentStrings #endif /* ACE_WIN32 && UNICODE !ACE_USES_TCHAR */ +#if !defined (ACE_LACKS_ENV) ACE_TCHAR * ACE_OS::getenvstrings (void) { @@ -7133,6 +7134,7 @@ ACE_OS::getenvstrings (void) ACE_NOTSUP_RETURN (0); #endif /* ACE_WIN32 */ } +#endif /* ACE_LACKS_ENV */ #if defined (ACE_HAS_STRPTIME) char * @@ -28,6 +28,7 @@ #include "ace/OS_String.h" #include "ace/OS_Memory.h" #include "ace/OS_TLI.h" +#include "ace/OS_Errno.h" /// States of a recyclable object. enum ACE_Recyclable_State @@ -96,10 +97,6 @@ typedef long long longlong_t; typedef long id_t; # endif /* ACE_PSOS_TM */ -# if defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) -# define ACE_NO_INLINE -# endif /* defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) */ - // Deal with MSVC++ insanity for CORBA... # if defined (ACE_HAS_BROKEN_NAMESPACES) # define ACE_CORBA_1(NAME) CORBA_##NAME @@ -411,7 +408,7 @@ typedef long id_t; # endif /* ACE_NON_BLOCKING_BUG_DELAY */ # if defined (_DEBUG) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) -class ACE_Export ACE_No_Heap_Check +class ACE_OS_Export ACE_No_Heap_Check { public: ACE_No_Heap_Check (void) @@ -494,22 +491,22 @@ typedef int key_t; /////////////////////////////////////////// #if defined (ACE_HAS_PACE) -# include "pace/dirent.h" -# include "pace/fcntl.h" -# include "pace/sys/mman.h" -# include "pace/pthread.h" -# include "pace/pwd.h" -# include "pace/stdio.h" -# include "pace/stdlib.h" -# include "pace/sched.h" -# include "pace/semaphore.h" -# include "pace/signal.h" -# include "pace/sys/stat.h" -# include "pace/stdio.h" -# include "pace/time.h" -# include "pace/unistd.h" -# include "pace/sys/utsname.h" -# include "pace/sys/wait.h" +# include /**/ "pace/dirent.h" +# include /**/ "pace/fcntl.h" +# include /**/ "pace/sys/mman.h" +# include /**/ "pace/pthread.h" +# include /**/ "pace/pwd.h" +# include /**/ "pace/stdio.h" +# include /**/ "pace/stdlib.h" +# include /**/ "pace/sched.h" +# include /**/ "pace/semaphore.h" +# include /**/ "pace/signal.h" +# include /**/ "pace/sys/stat.h" +# include /**/ "pace/stdio.h" +# include /**/ "pace/time.h" +# include /**/ "pace/unistd.h" +# include /**/ "pace/sys/utsname.h" +# include /**/ "pace/sys/wait.h" #endif /* ACE_HAS_PACE */ # if defined (ACE_PSOS) @@ -868,7 +865,7 @@ typedef struct timespec #if defined (ACE_PSOS_HAS_TIME) // Use pSOS time, wrapped . . . -class ACE_Export ACE_PSOS_Time_t +class ACE_OS_Export ACE_PSOS_Time_t { public: /// default ctor: date, time, and ticks all zeroed. @@ -1044,11 +1041,11 @@ typedef int clockid_t; // compilers and they can be removed once MS release a SP that contains // the fix. class ACE_Time_Value; -ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); +ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, + const ACE_Time_Value &tv2); -ACE_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); +ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, + const ACE_Time_Value &tv2); // ------------------------------------------------------------------- @@ -1063,7 +1060,7 @@ ACE_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, * <ACE_Time_Value> makes the use of these mechanisms portable * across OS platforms, */ -class ACE_Export ACE_Time_Value +class ACE_OS_Export ACE_Time_Value { public: // = Useful constants. @@ -1168,35 +1165,35 @@ public: ACE_Time_Value &operator *= (double d); /// Adds two ACE_Time_Value objects together, returns the sum. - friend ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, + friend ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// Subtracts two ACE_Time_Value objects, returns the difference. - friend ACE_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, + friend ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 < tv2. - friend ACE_Export int operator < (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator < (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 > tv2. - friend ACE_Export int operator > (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator > (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 <= tv2. - friend ACE_Export int operator <= (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator <= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 >= tv2. - friend ACE_Export int operator >= (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator >= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 == tv2. - friend ACE_Export int operator == (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator == (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// True if tv1 != tv2. - friend ACE_Export int operator != (const ACE_Time_Value &tv1, + friend ACE_OS_Export int operator != (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); /// Dump the state of an object. @@ -1224,7 +1221,7 @@ private: * time the <stop> method is called the <max_wait_time> is * updated. */ -class ACE_Export ACE_Countdown_Time +class ACE_OS_Export ACE_Countdown_Time { public: // = Initialization and termination methods. @@ -1511,7 +1508,6 @@ static ACE_Static_Svc_##X ace_static_svc_##X; #endif /* !ACE_LACKS_STATIC_CONSTRUCTORS */ - // More generic dynamic/static service macros. # define ACE_FACTORY_DECLARE(CLS,X) extern "C" CLS##_Export ACE_Service_Object *_make_##X (ACE_Service_Object_Exterminator *); # define ACE_FACTORY_DEFINE(CLS,X) \ @@ -1637,7 +1633,7 @@ typedef const struct rlimit ACE_SETRLIMIT_TYPE; if (OBJ.locked () == 0) return RETURN; #if defined (ACE_HAS_PACE) -# include "pace/semaphore.h" +# include /**/ "pace/semaphore.h" # if !defined (SEM_FAILED) # define SEM_FAILED ((pace_sem_t *) -1) # endif /* !SEM_FAILED */ @@ -2022,7 +2018,7 @@ typedef pthread_mutex_t ACE_thread_mutex_t; * POSIX pthreads, but do *not* support POSIX semaphores, i.e., * it's a different type than the POSIX <sem_t>. */ -class ACE_Export ACE_sema_t +class ACE_OS_Export ACE_sema_t { friend class ACE_OS; protected: @@ -2069,11 +2065,11 @@ typedef sema_t ACE_sema_t; # endif /* !ACE_HAS_POSIX_SEM */ typedef cond_t ACE_cond_t; -struct ACE_Export ACE_condattr_t +struct ACE_OS_Export ACE_condattr_t { int type; }; -struct ACE_Export ACE_mutexattr_t +struct ACE_OS_Export ACE_mutexattr_t { int type; }; @@ -2102,7 +2098,7 @@ typedef u_long ACE_hthread_t; #if defined (ACE_PSOS_HAS_COND_T) typedef u_long ACE_cond_t; typedef u_long ACE_condattr_t; -struct ACE_Export ACE_mutexattr_t +struct ACE_OS_Export ACE_mutexattr_t { int type; }; @@ -2280,7 +2276,7 @@ typedef HANDLE ACE_sema_t; * * @brief Semaphore simulation for Windows CE. */ -class ACE_Export ACE_sema_t +class ACE_OS_Export ACE_sema_t { public: /// Serializes access to <count_>. @@ -2327,7 +2323,7 @@ public: * At the current time, this stuff only works for threads * within the same process. */ -class ACE_Export ACE_cond_t +class ACE_OS_Export ACE_cond_t { public: friend class ACE_OS; @@ -2367,7 +2363,7 @@ protected: size_t was_broadcast_; }; -struct ACE_Export ACE_condattr_t +struct ACE_OS_Export ACE_condattr_t { int type; }; @@ -2375,7 +2371,7 @@ struct ACE_Export ACE_condattr_t # if defined (ACE_HAS_PACE) typedef pace_pthread_mutexattr_t ACE_mutexattr_t; # else -struct ACE_Export ACE_mutexattr_t +struct ACE_OS_Export ACE_mutexattr_t { int type; }; @@ -2393,7 +2389,7 @@ struct ACE_Export ACE_mutexattr_t * At the current time, this stuff only works for threads * within the same process. */ -struct ACE_Export ACE_rwlock_t +struct ACE_OS_Export ACE_rwlock_t { protected: friend class ACE_OS; @@ -2546,11 +2542,11 @@ public: # endif /* ! USYNC_PROCESS */ // These are dummies needed for class OS.h typedef int ACE_cond_t; -struct ACE_Export ACE_condattr_t +struct ACE_OS_Export ACE_condattr_t { int type; }; -struct ACE_Export ACE_mutexattr_t +struct ACE_OS_Export ACE_mutexattr_t { int type; }; @@ -2582,7 +2578,7 @@ typedef u_int ACE_thread_key_t; # if defined (ACE_PSOS) // Wrapper for NT events on pSOS. -class ACE_Export ACE_event_t +class ACE_OS_Export ACE_event_t { friend class ACE_OS; @@ -2688,10 +2684,13 @@ typedef unsigned int size_t; # include /**/ <sched.h> # endif /* ACE_NEEDS_SCHED_H */ -# if defined (ACE_HAS_WINCE) -# define islower iswlower -# define isdigit iswdigit -# endif /* ACE_HAS_WINCE */ +#if !defined (ACE_OSTREAM_TYPE) +# if defined (ACE_LACKS_IOSTREAM_TOTALLY) +# define ACE_OSTREAM_TYPE FILE +# else /* ! ACE_LACKS_IOSTREAM_TOTALLY */ +# define ACE_OSTREAM_TYPE ostream +# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ +#endif /* ! ACE_OSTREAM_TYPE */ #if !defined (ACE_DEFAULT_LOG_STREAM) # if defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -3332,7 +3331,7 @@ typedef int ACE_exitcode; # define ACE_DEV_NULL "/dev/null" // Wrapper for NT events on UNIX. -class ACE_Export ACE_event_t +class ACE_OS_Export ACE_event_t { friend class ACE_OS; protected: @@ -4250,7 +4249,7 @@ typedef const ACE_TCHAR * ACE_DL_TYPE; # if defined (ACE_HAS_PACE) typedef pace_siginfo_t siginfo_t; # else -struct ACE_Export siginfo_t +struct ACE_OS_Export siginfo_t { siginfo_t (ACE_HANDLE handle); siginfo_t (ACE_HANDLE *handles); // JCEJ 12/23/96 @@ -4299,7 +4298,7 @@ typedef int ucontext_t; * * @brief Defines a platform-independent thread ID. */ -class ACE_Export ACE_Thread_ID +class ACE_OS_Export ACE_Thread_ID { public: // = Initialization method. @@ -4381,7 +4380,7 @@ struct strbuf * * @brief Simple wrapper for STREAM pipes strbuf. */ -class ACE_Export ACE_Str_Buf : public strbuf +class ACE_OS_Export ACE_Str_Buf : public strbuf { public: // = Initialization method @@ -4428,7 +4427,7 @@ int ACE_SEH_Default_Exception_Handler (void *); * * @brief Base class for objects that are cleaned by ACE_Object_Manager. */ -class ACE_Export ACE_Cleanup +class ACE_OS_Export ACE_Cleanup { public: /// No-op constructor. @@ -4442,7 +4441,7 @@ public: }; // Adapter for cleanup, used by ACE_Object_Manager. -extern "C" ACE_Export +extern "C" ACE_OS_Export void ace_cleanup_destroyer (ACE_Cleanup *, void *param = 0); /** @@ -4450,7 +4449,7 @@ void ace_cleanup_destroyer (ACE_Cleanup *, void *param = 0); * * @brief Hold cleanup information for thread/process */ -class ACE_Export ACE_Cleanup_Info +class ACE_OS_Export ACE_Cleanup_Info { public: /// Default constructor. @@ -4481,7 +4480,7 @@ class ACE_Cleanup_Info_Node; * * For internal use by the ACE library, only. */ -class ACE_Export ACE_OS_Exit_Info +class ACE_OS_Export ACE_OS_Exit_Info { public: /// Default constructor. @@ -4630,7 +4629,7 @@ struct ACE_Protocol_Info * @brief Wrapper class that defines the flow spec QoS information, * which is used by IntServ (RSVP) and DiffServ. */ -class ACE_Export ACE_Flow_Spec +class ACE_OS_Export ACE_Flow_Spec #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) : public FLOWSPEC #endif /* ACE_HAS_WINSOCK2 */ @@ -4716,7 +4715,7 @@ private: * @brief Wrapper class that holds the sender and receiver flow spec * information, which is used by IntServ (RSVP) and DiffServ. */ -class ACE_Export ACE_QoS +class ACE_OS_Export ACE_QoS #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) : public QOS #endif /* ACE_HAS_WINSOCK2 */ @@ -4750,7 +4749,7 @@ private: * @brief Wrapper class that simplifies the information passed to the QoS * enabled <ACE_OS::connect> and <ACE_OS::join_leaf> methods. */ -class ACE_Export ACE_QoS_Params +class ACE_OS_Export ACE_QoS_Params { public: /** @@ -4839,7 +4838,7 @@ typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (u_long error, * @brief Wrapper class that simplifies the information passed to the QoS * enabled <ACE_OS::accept> method. */ -class ACE_Export ACE_Accept_QoS_Params +class ACE_OS_Export ACE_Accept_QoS_Params { public: /** @@ -4898,7 +4897,7 @@ private: * in this directory for complete information on the meaning of * the various macros. */ -class ACE_Export ACE_OS +class ACE_OS_Export ACE_OS : public ACE_OS_Dirent, public ACE_OS_String, public ACE_OS_Memory, @@ -4980,15 +4979,18 @@ public: /// This method computes the smallest integral value not less than x. static double ceil (double x); +# if !defined (ACE_LACKS_ENV) static char *getenv (const char *symbol); -# if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) +# if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) static wchar_t *getenv (const wchar_t *symbol); -# endif /* ACE_HAS_WCHAR && ACE_WIN32 */ +# endif /* ACE_HAS_WCHAR && ACE_WIN32 */ static int putenv (const ACE_TCHAR *string); static ACE_TCHAR *strenvdup (const ACE_TCHAR *str); static ACE_TCHAR *getenvstrings (void); +# endif /* ACE_LACKS_ENV */ + static int getopt (int argc, char *const *argv, const char *optstring); @@ -5030,14 +5032,17 @@ public: # endif /* ACE_WIN32 && ACE_HAS_WTHREADS */ //@} + //@{ @name Wrappers to obtain the current user id +# if !defined (ACE_LACKS_CUSERID) static char *cuserid (char *user, size_t maxlen = ACE_MAX_USERID); -# if defined (ACE_HAS_WCHAR) +# if defined (ACE_HAS_WCHAR) static wchar_t *cuserid (wchar_t *user, size_t maxlen = ACE_MAX_USERID); -# endif /* ACE_HAS_WCHAR */ +# endif /* ACE_HAS_WCHAR */ +# endif /* ACE_LACKS_CUSERID */ //@} //@{ @name Wrappers to obtain configuration info @@ -5045,7 +5050,6 @@ public: static long sysinfo (int cmd, char *buf, long count); - static int hostname (char *name, size_t maxnamelen); @@ -5597,11 +5601,14 @@ public: //@{ @name A set of wrappers for directory operations. static mode_t umask (mode_t cmask); + +#if !defined (ACE_LACKS_CHDIR) static int chdir (const char *path); #if defined (ACE_HAS_WCHAR) static int chdir (const wchar_t *path); #endif /* ACE_HAS_WCHAR */ +#endif /* ACE_LACKS_CHDIR */ static int mkdir (const ACE_TCHAR *path, mode_t mode = ACE_DEFAULT_DIR_PERMS); @@ -6163,6 +6170,19 @@ public: #endif /* ACE_HAS_STRPTIME */ private: + +#if defined (ACE_LACKS_WRITEV) + static int writev_emulation (ACE_HANDLE handle, + ACE_WRITEV_TYPE *iov, + int iovcnt); +#endif /* ACE_LACKS_WRITEV */ + +#if defined (ACE_LACKS_READV) + static ssize_t readv_emulation (ACE_HANDLE handle, + ACE_READV_TYPE *iov, + int iovcnt); +#endif /* ACE_LACKS_READV */ + /// Function that is called by <ACE_OS::exit>, if non-null. static ACE_EXIT_HOOK exit_hook_; @@ -6195,7 +6215,7 @@ private: * * Encapsulates the most useful ACE_Object_Manager data structures. */ -class ACE_Export ACE_Object_Manager_Base +class ACE_OS_Export ACE_Object_Manager_Base { # if (defined (ACE_PSOS) && defined (__DIAB)) || \ (defined (__DECCXX_VER) && __DECCXX_VER < 60000000) @@ -6284,7 +6304,7 @@ ACE_OS_Object_Manager_Internal_Exit_Hook (void); // @@ This forward declaration should go away. class ACE_Log_Msg; -class ACE_Export ACE_OS_Object_Manager : public ACE_Object_Manager_Base +class ACE_OS_Export ACE_OS_Object_Manager : public ACE_Object_Manager_Base { public: /// Explicitly initialize. @@ -6469,7 +6489,7 @@ extern "C" ssize_t writev_timedwait (ACE_HANDLE handle, * native TSS, or have a TSS with limitations such as the * number of keys or lack of support for removing keys. */ -class ACE_Export ACE_TSS_Emulation +class ACE_OS_Export ACE_TSS_Emulation { public: typedef void (*ACE_TSS_DESTRUCTOR)(void *value) /* throw () */; @@ -6976,7 +6996,7 @@ private: # define ACE_PTHREAD_CLEANUP_POP(A) pace_pthread_cleanup_pop(A) # elif defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. -extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args); +extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP) @@ -7093,34 +7113,7 @@ ace_main_i # endif /* ACE_PSOSIM */ # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ -# if defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -/** - * @class ACE_CE_Errno - Some versions of CE don't support <errno> and some versions' - * implementations are busted. So we implement our own. - * Our implementation takes up one Tls key, however, it does not - * allocate memory fromt the heap so there's no problem with cleanin - * up the errno when a thread exit. - */ -class ACE_Export ACE_CE_Errno -{ -public: - ACE_CE_Errno () {} - static void init (); - static void fini (); - static ACE_CE_Errno *instance (); - - operator int (void) const; - int operator= (int); - -private: - static ACE_CE_Errno *instance_; - static DWORD errno_key_; -}; - -# define errno (* (ACE_CE_Errno::instance ())) -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ +#if defined (ACE_HAS_WINCE) /** * @class ACE_CE_Bridge @@ -7137,7 +7130,8 @@ private: * the original ACE programs. This is certainly not the only * way to use ACE in Windows programs. */ -class ACE_Export ACE_CE_Bridge +class ACE_OS_Export ACE_CE_Bridge + { public: /// Default ctor. @@ -7194,68 +7188,6 @@ private: # endif /* ACE_HAS_WINCE */ -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -# define ACE_ERRNO_TYPE ACE_CE_Errno -#else -# define ACE_ERRNO_TYPE int -#endif /* ACE_HAS_WINCE */ - -/** - * @class ACE_Errno_Guard - * - * @brief Provides a wrapper to improve performance when thread-specific - * errno must be saved and restored in a block of code. - * - * The typical use-case for this is the following: - * int error = errno; - * call_some_function_that_might_change_errno (); - * errno = error; - * This can be replaced with - * { - * ACE_Errno_Guard guard (errno); - * call_some_function_that_might_change_errno (); - * } - * This implementation is more elegant and more efficient since it - * avoids an unnecessary second access to thread-specific storage - * by caching a pointer to the value of errno in TSS. - */ -class ACE_Export ACE_Errno_Guard -{ -public: - // = Initialization and termination methods. - /// Stash the value of <error> into <error_> and initialize the - /// <errno_ptr_> to the address of <errno_ref>. - ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, - int error); - - /// Stash the value of <errno> into <error_> and initialize the - /// <errno_ptr_> to the address of <errno_ref>. - ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref); - - /// Reset the value of <errno> to <error>. - ~ACE_Errno_Guard (void); - -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - /// Assign <errno_ref> to <error_>. - int operator= (const ACE_ERRNO_TYPE &errno_ref); -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - - /// Assign <error> to <error_>. - int operator= (int error); - - /// Compare <error> with <error_> for equality. - int operator== (int error); - - /// Compare <error> with <error_> for inequality. - int operator!= (int error); - -private: -#if defined (ACE_MT_SAFE) - ACE_ERRNO_TYPE *errno_ptr_; -#endif /* ACE_MT_SAFE */ - int error_; -}; - # if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ && ! defined (ACE_HAS_PHARLAP) typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS; @@ -7285,22 +7217,6 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; # define ACE_WAIT_TIMEOUT LONG_MAX # endif /* ACE_WIN32 */ - -// Some ACE classes always use inline functions to maintain high -// performance, but some platforms have buggy inline function support. -// In this case, we don't use inline with them. -# if defined (ACE_LACKS_INLINE_FUNCTIONS) -# if defined (ASYS_INLINE) -# undef ASYS_INLINE -# endif /* ASYS_INLINE */ -# define ASYS_INLINE -# if defined (ACE_HAS_INLINED_OSCALLS) -# undef ACE_HAS_INLINED_OSCALLS -# endif /* ACE_HAS_INLINED_OSCALLS */ -# else -# define ASYS_INLINE inline -# endif /* ACE_LACKS_INLINE_FUNCTIONS */ - # if !defined (ACE_HAS_MINIMAL_ACE_OS) # include "ace/Trace.h" # endif /* ! ACE_HAS_MINIMAL_ACE_OS */ @@ -7508,6 +7424,10 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; #define ACE_SIGRTMAX 0 #endif /* ACE_HAS_AIO_CALLS */ +# if defined (ACE_LACKS_SYS_NERR) +extern ACE_OS_Export int sys_nerr; +# endif /* ACE_LACKS_SYS_NERR */ + #if defined (ACE_LEGACY_MODE) # include "ace/Log_Msg.h" # include "ace/Thread_Hook.h" @@ -64,14 +64,6 @@ extern int setregid (gid_t rgid, gid_t egid); # endif /* ACE_LACKS_SETREGID_PROTOTYPE */ #endif /* !_BSD_SOURCE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED */ -#if defined (ACE_LACKS_WRITEV) -extern "C" ACE_Export int writev (ACE_HANDLE handle, ACE_WRITEV_TYPE *iov, int iovcnt); -#endif /* ACE_LACKS_WRITEV */ - -#if defined (ACE_LACKS_READV) -extern "C" ACE_Export ssize_t readv (ACE_HANDLE handle, ACE_READV_TYPE *iov, int iovcnt); -#endif /* ACE_LACKS_READV */ - #if defined (ACE_NEEDS_FTRUNCATE) extern "C" ACE_Export int ftruncate (ACE_HANDLE handle, long len); #endif /* ACE_NEEDS_FTRUNCATE */ @@ -144,89 +136,6 @@ typedef const struct timespec * ACE_TIMESPEC_PTR; # include /**/ <malloc.h> #endif /* ACE_LACKS_MALLOC_H */ -ACE_INLINE -ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, - int error) - : -#if defined (ACE_MT_SAFE) - errno_ptr_ (&errno_ref), -#endif /* ACE_MT_SAFE */ - error_ (error) -{ -#if !defined(ACE_MT_SAFE) - ACE_UNUSED_ARG (errno_ref); -#endif /* ACE_MT_SAFE */ -} - -ACE_INLINE -ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref) - : -#if defined (ACE_MT_SAFE) - errno_ptr_ (&errno_ref), -#endif /* ACE_MT_SAFE */ - error_ (errno_ref) -{ -} - -ACE_INLINE -ACE_Errno_Guard::~ACE_Errno_Guard (void) -{ -#if defined (ACE_MT_SAFE) - *errno_ptr_ = this->error_; -#else - errno = this->error_; -#endif /* ACE_MT_SAFE */ -} - -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -ACE_INLINE int -ACE_Errno_Guard::operator= (const ACE_ERRNO_TYPE &error) -{ - return this->error_ = error; -} -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - -ACE_INLINE int -ACE_Errno_Guard::operator= (int error) -{ - return this->error_ = error; -} - -ACE_INLINE int -ACE_Errno_Guard::operator== (int error) -{ - return this->error_ == error; -} - -ACE_INLINE int -ACE_Errno_Guard::operator!= (int error) -{ - return this->error_ != error; -} - -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -ACE_INLINE ACE_CE_Errno * -ACE_CE_Errno::instance () -{ - // This should be inlined. - return ACE_CE_Errno::instance_; -} - -ACE_INLINE -ACE_CE_Errno::operator int (void) const -{ - return (int) TlsGetValue (ACE_CE_Errno::errno_key_); -} - -ACE_INLINE int -ACE_CE_Errno::operator= (int x) -{ - // error checking? - TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x); - return x; -} -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - // Returns the value of the object as a timeval. ACE_INLINE @@ -576,6 +485,7 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg) # endif /* ACE_HAS_PACE */ } +#if !defined (ACE_LACKS_CHDIR) ACE_INLINE int ACE_OS::chdir (const char *path) { @@ -618,6 +528,7 @@ ACE_OS::chdir (const wchar_t *path) #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ +#endif /* ACE_LACKS_CHDIR */ #if !defined (ACE_LACKS_MKTEMP) ACE_INLINE ACE_TCHAR * @@ -1315,6 +1226,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) # endif /* ACE_HAS_PACE */ } +#if !defined (ACE_LACKS_CUSERID) ACE_INLINE char * ACE_OS::cuserid (char *user, size_t maxlen) { @@ -1332,9 +1244,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (CHORUS) || defined (ACE_HAS_WINCE) || defined (ACE_PSOS) || defined (__QNXNTO__) - // @@ WinCE doesn't support GetUserName. But there should be a way - // to get around this. +#elif defined (CHORUS) || defined (ACE_PSOS) || defined (__QNXNTO__) ACE_UNUSED_ARG (user); ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); @@ -1441,7 +1351,8 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen) return result; # endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ +#endif /* ACE_HAS_WCHAR */ +#endif /* ACE_LACKS_CUSERID */ ACE_INLINE int ACE_OS::atexit (ACE_EXIT_HOOK func) @@ -8129,7 +8040,13 @@ ACE_OS::readv (ACE_HANDLE handle, int iovlen) { ACE_OS_TRACE ("ACE_OS::readv"); +#if defined (ACE_LACKS_READV) + ACE_OSCALL_RETURN (ACE_OS::readv_emulation (handle, iov, iovlen), + ssize_t, + -1); +#else /* ACE_LACKS_READV */ ACE_OSCALL_RETURN (::readv (handle, iov, iovlen), ssize_t, -1); +#endif /* ACE_LACKS_READV */ } ACE_INLINE ssize_t @@ -8138,7 +8055,15 @@ ACE_OS::writev (ACE_HANDLE handle, int iovcnt) { ACE_OS_TRACE ("ACE_OS::writev"); - ACE_OSCALL_RETURN (::writev (handle, (ACE_WRITEV_TYPE *) iov, iovcnt), int, -1); +#if defined (ACE_LACKS_WRITEV) + ACE_OSCALL_RETURN (ACE_OS::writev_emulation (handle, + (ACE_WRITEV_TYPE *) iov, + iovcnt), int, -1); +#else /* ACE_LACKS_WRITEV */ + ACE_OSCALL_RETURN (::writev (handle, + (ACE_WRITEV_TYPE *) iov, + iovcnt), int, -1); +#endif /* ACE_LACKS_WRITEV */ } ACE_INLINE ssize_t @@ -8345,11 +8270,11 @@ ACE_OS::access (const char *path, int amode) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); -#else /* ACE_WIN32 */ +#else /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); -#endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -8400,13 +8325,7 @@ ACE_INLINE int ACE_OS::hostname (char name[], size_t maxnamelen) { ACE_OS_TRACE ("ACE_OS::hostname"); -#if defined (ACE_HAS_WINCE) - // @@ WINCE: Don't know how to implement this (yet.) Can probably get around - // this by peeking into the Register set. - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (maxnamelen); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) // PharLap only can do net stuff with the RT version. # if defined (ACE_HAS_PHARLAP_RT) // @@This is not at all reliable... requires ethernet and BOOTP to be used. @@ -8418,12 +8337,12 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_UNUSED_ARG (maxnamelen); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ +#elif defined (VXWORKS) || defined (ACE_HAS_WINCE) + ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameA (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); -#elif defined (VXWORKS) - ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1); #elif defined (CHORUS) if (::gethostname (name, maxnamelen) == -1) return -1; @@ -8438,7 +8357,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) } return 0; } -#else /* ACE_HAS_WINCE */ +#else /* ACE_HAS_PHARLAP */ struct utsname host_info; if (ACE_OS::uname (&host_info) == -1) @@ -8448,18 +8367,18 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_OS::strncpy (name, host_info.nodename, maxnamelen); return 0; } -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ } #if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::hostname (wchar_t name[], size_t maxnamelen) { -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (GetComputerNameW (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); -#else /* ACE_WIN32 */ +#else /* ACE_WIN32 && !ACE_HAS_WINCE */ // Emulate using the char version char *char_name = 0; int result = 0; @@ -8471,7 +8390,7 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) delete [] char_name; return result; -#endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -11102,18 +11021,19 @@ ACE_OS::mkdir (const ACE_TCHAR *path, mode_t mode) #endif /* ACE_HAS_PACE */ } +#if !defined (ACE_LACKS_ENV) ACE_INLINE char * ACE_OS::getenv (const char *symbol) { ACE_OS_TRACE ("ACE_OS::getenv"); #if defined (ACE_HAS_PACE) ACE_OSCALL_RETURN (::pace_getenv (symbol), char*, 0); -#elif defined (ACE_HAS_WINCE) || defined (ACE_PSOS) +#elif defined (ACE_PSOS) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#else /* ACE_HAS_WINCE || ACE_PSOS */ +#else /* ACE_PSOS */ ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); -#endif /* symbol */ +#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) @@ -11139,6 +11059,7 @@ ACE_OS::putenv (const ACE_TCHAR *string) ACE_OSCALL_RETURN (::putenv ((char *) string), int, -1); #endif /* ACE_HAS_WINCE */ } +#endif /* !ACE_LACKS_ENV */ ACE_INLINE ACE_Str_Buf::ACE_Str_Buf (void *b, int l, int max) @@ -11727,6 +11648,7 @@ ACE_OS::fopen_mode_to_open_mode_converter (ACE_TCHAR x, int &hmode) } #endif /* ACE_WIN32 */ +# if !defined (ACE_LACKS_ENV) // Return a dynamically allocated duplicate of <str>, substituting the // environment variable if <str[0] == '$'>. Note that the pointer is // allocated with <ACE_OS::malloc> and must be freed by @@ -11748,6 +11670,7 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) return ACE_OS::strdup (str); #endif /* ACE_HAS_WINCE */ } +#endif /* ACE_LACKS_ENV */ ACE_INLINE int ACE_Countdown_Time::start (void) diff --git a/ace/OS_Dirent.h b/ace/OS_Dirent.h index 0d25cbd9d51..a3f5db3d9c5 100644 --- a/ace/OS_Dirent.h +++ b/ace/OS_Dirent.h @@ -17,7 +17,6 @@ #define ACE_OS_DIRENT_H #include "ace/pre.h" - #include "ace/config-all.h" #include "ace/OS_Export.h" @@ -25,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_WIN32) && !defined (ACE_PSOS) +#if !defined (ACE_WIN32) && !defined (ACE_PSOS) && !defined (ACE_WINCE) # include /**/ <sys/types.h> # if !defined (ACE_LACKS_UNISTD_H) # include /**/ <unistd.h> // VxWorks needs this to compile diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl index 5064cfc089b..19d2bc2031f 100644 --- a/ace/OS_Dirent.inl +++ b/ace/OS_Dirent.inl @@ -2,7 +2,7 @@ // $Id$ #if defined (ACE_HAS_PACE) -#include "pace/dirent.h" +#include /**/ "pace/dirent.h" #endif /* ACE_HAS_PACE */ ACE_INLINE DIR * ACE_OS_Dirent::opendir (const ACE_TCHAR *filename) diff --git a/ace/OS_Errno.cpp b/ace/OS_Errno.cpp new file mode 100644 index 00000000000..4d0e6af3287 --- /dev/null +++ b/ace/OS_Errno.cpp @@ -0,0 +1,32 @@ +// -*- C++ -*- +// $Id$ + +#include "ace/OS_Errno.h" + +ACE_RCSID(ace, OS_Errno, "$Id$") + +#if !defined (ACE_HAS_INLINED_OSCALLS) +# include "ace/OS_Errno.inl" +#endif /* ACE_HAS_INLINED_OS_CALLS */ + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) + +ACE_CE_Errno *ACE_CE_Errno::instance_ = 0; +DWORD ACE_CE_Errno::errno_key_ = 0xffffffff; + +void +ACE_CE_Errno::init () +{ + ACE_CE_Errno::instance_ = new ACE_CE_Errno (); + ACE_CE_Errno::errno_key_ = TlsAlloc (); +} + +void +ACE_CE_Errno::fini () +{ + TlsFree (ACE_CE_Errno::errno_key_); + delete ACE_CE_Errno::instance_; + ACE_CE_Errno::instance_ = 0; +} + +#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ diff --git a/ace/OS_Errno.h b/ace/OS_Errno.h new file mode 100644 index 00000000000..0fced2d8a6e --- /dev/null +++ b/ace/OS_Errno.h @@ -0,0 +1,146 @@ +// -*- C++ -*- +//============================================================================= +/** + * @file OS_Errno.h + * + * $Id$ + * + * @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu> + * @author Jesper S. M|ller<stophph@diku.dk> + * @author and a cast of thousands... + */ +//============================================================================= + + +#ifndef ACE_OS_ERRNO_H +#define ACE_OS_ERRNO_H +#include "ace/pre.h" + +#include "ace/config.h" +#include "ace/OS_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if defined (ACE_HAS_H_ERRNO) +void herror (const char *str); +#endif /* ACE_HAS_H_ERRNO */ + +#if !defined (ACE_HAS_WINCE) +# include /**/ <errno.h> +#endif /* ACE_HAS_WINCE */ + +#if !defined (ACE_WIN32) && !defined (ACE_PSOS) && defined (ACE_LACKS_T_ERRNO) +extern int t_errno; +#endif /* ACE_WIN32 && !ACE_PSOS && ACE_LACKS_T_ERRNO */ + +#if !defined (ENOSYS) +# define ENOSYS EFAULT /* Operation not supported or unknown error. */ +#endif /* !ENOSYS */ + +#if !defined (ENOTSUP) +# define ENOTSUP ENOSYS /* Operation not supported. */ +#endif /* !ENOTSUP */ + + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) +/** + * @class ACE_CE_Errno + * + * Some versions of CE don't support <errno> and some versions' + * implementations are busted. So we implement our own. + * Our implementation takes up one Tls key, however, it does not + * allocate memory fromt the heap so there's no problem with cleanin + * up the errno when a thread exit. + */ +class ACE_OS_Export ACE_CE_Errno +{ +public: + ACE_CE_Errno () {} + static void init (); + static void fini (); + static ACE_CE_Errno *instance (); + + operator int (void) const; + int operator= (int); + +private: + static ACE_CE_Errno *instance_; + static DWORD errno_key_; +}; + +# define errno (* (ACE_CE_Errno::instance ())) +#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) +# define ACE_ERRNO_TYPE ACE_CE_Errno +#else +# define ACE_ERRNO_TYPE int +#endif /* ACE_HAS_WINCE */ + +/** + * @class ACE_Errno_Guard + * + * @brief Provides a wrapper to improve performance when thread-specific + * errno must be saved and restored in a block of code. + * + * The typical use-case for this is the following: + * int error = errno; + * call_some_function_that_might_change_errno (); + * errno = error; + * This can be replaced with + * { + * ACE_Errno_Guard guard (errno); + * call_some_function_that_might_change_errno (); + * } + * This implementation is more elegant and more efficient since it + * avoids an unnecessary second access to thread-specific storage + * by caching a pointer to the value of errno in TSS. + */ +class ACE_OS_Export ACE_Errno_Guard +{ +public: + /// Stash the value of <error> into <error_> and initialize the + /// <errno_ptr_> to the address of <errno_ref>. + ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, + int error); + + /// Stash the value of <errno> into <error_> and initialize the + /// <errno_ptr_> to the address of <errno_ref>. + ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref); + + /// Reset the value of <errno> to <error>. + ~ACE_Errno_Guard (void); + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) + /// Assign <errno_ref> to <error_>. + int operator= (const ACE_ERRNO_TYPE &errno_ref); +#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ + + /// Assign <error> to <error_>. + int operator= (int error); + + /// Compare <error> with <error_> for equality. + int operator== (int error); + + /// Compare <error> with <error_> for inequality. + int operator!= (int error); + +private: +#if defined (ACE_MT_SAFE) + ACE_ERRNO_TYPE *errno_ptr_; +#endif /* ACE_MT_SAFE */ + int error_; +}; + +#if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/OS_Errno.inl" +#endif /* ACE_HAS_INLINED_OSCALLS */ + +#include "ace/post.h" +#endif /* ACE_OS_ERRNO_H */ diff --git a/ace/OS_Errno.inl b/ace/OS_Errno.inl new file mode 100644 index 00000000000..1fb222075be --- /dev/null +++ b/ace/OS_Errno.inl @@ -0,0 +1,87 @@ +// -*- C++ -*- +// $Id$ + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) + +ACE_INLINE ACE_CE_Errno * +ACE_CE_Errno::instance () +{ + // This should be inlined. + return ACE_CE_Errno::instance_; +} + +ACE_INLINE +ACE_CE_Errno::operator int (void) const +{ + return (int) TlsGetValue (ACE_CE_Errno::errno_key_); +} + +ACE_INLINE int +ACE_CE_Errno::operator= (int x) +{ + // error checking? + TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x); + return x; +} + +#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ + +ACE_INLINE +ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, + int error) + : +#if defined (ACE_MT_SAFE) + errno_ptr_ (&errno_ref), +#endif /* ACE_MT_SAFE */ + error_ (error) +{ +#if !defined(ACE_MT_SAFE) + ACE_UNUSED_ARG (errno_ref); +#endif /* ACE_MT_SAFE */ +} + +ACE_INLINE +ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref) + : +#if defined (ACE_MT_SAFE) + errno_ptr_ (&errno_ref), +#endif /* ACE_MT_SAFE */ + error_ (errno_ref) +{ +} + +ACE_INLINE +ACE_Errno_Guard::~ACE_Errno_Guard (void) +{ +#if defined (ACE_MT_SAFE) + *errno_ptr_ = this->error_; +#else + errno = this->error_; +#endif /* ACE_MT_SAFE */ +} + +#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) +ACE_INLINE int +ACE_Errno_Guard::operator= (const ACE_ERRNO_TYPE &error) +{ + return this->error_ = error; +} +#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ + +ACE_INLINE int +ACE_Errno_Guard::operator= (int error) +{ + return this->error_ = error; +} + +ACE_INLINE int +ACE_Errno_Guard::operator== (int error) +{ + return this->error_ == error; +} + +ACE_INLINE int +ACE_Errno_Guard::operator!= (int error) +{ + return this->error_ != error; +} diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index 1c70293ca56..61d3195dd86 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -25,8 +25,8 @@ #include "ace/OS_Export.h" #if defined (ACE_HAS_PACE) -# include "pace/stddef.h" -# include "pace/stdlib.h" +# include /**/ "pace/stddef.h" +# include /**/ "pace/stdlib.h" #else # include /**/ <stddef.h> #endif /* ACE_HAS_PACE */ diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index 41d01eb6de8..0e70a4201c4 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -102,6 +102,17 @@ ACE_OS_String::strdup (const wchar_t *s) } #endif /* ACE_HAS_WCHAR */ +#if defined (ACE_LACKS_STRERROR) +/** + * Just returns "Unknown Error" all the time. + */ +char * +ACE_OS_String::strerror_emulation (int errnum) +{ + return "Unknown Error"; +} +#endif /* ACE_LACKS_STRERROR */ + #if defined (ACE_LACKS_STRCHR) char * ACE_OS_String::strchr_emulation (char *s, int c) @@ -607,6 +618,25 @@ ACE_OS_String::wcscat_emulation (wchar_t *destination, } #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ +#if defined (ACE_LACKS_STRSPN) +size_t +ACE_OS_String::strspn_emulation (const char *string, + const char *charset) +{ + const char *p = string; + const char *spanp; + wchar_t c, sc; + + // Skip any characters in charset, excluding the terminating \0. +cont: + c = *p++; + for (spanp = charset; (sc = *spanp++) != 0;) + if (sc == c) + goto cont; + return (p - 1 - string); +} +#endif /* ACE_LACKS_STRSPN */ + #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN) size_t ACE_OS_String::wcsspn_emulation (const wchar_t *string, @@ -714,6 +744,25 @@ ACE_OS_String::wcscpy_emulation (wchar_t *destination, } #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */ +#if defined (ACE_LACKS_STRPBRK) +char * +ACE_OS_String::strpbrk_emulation (const char *string, + const char *charset) +{ + const char *scanp; + int c, sc; + + while ((c = *string++) != 0) + { + for (scanp = charset; (sc = *scanp++) != 0;) + if (sc == c) + return ACE_const_cast (char *, string - 1); + } + + return NULL; +} +#endif /* ACE_LACKS_STRPBRK */ + #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK) wchar_t * ACE_OS_String::wcspbrk_emulation (const wchar_t *string, @@ -794,3 +843,144 @@ ACE_OS_String::wcsncmp_emulation (const wchar_t *s1, return 0; } #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNCMP */ + +#if defined (ACE_LACKS_STRTOL) +long +ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base) +{ + register const char *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long)base; + cutoff /= (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? LONG_MIN : LONG_MAX; + errno = ERANGE; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)s - 1 : (char *)nptr; + return (acc); +} +#endif /* ACE_LACKS_STRTOL */ + +#if defined (ACE_LACKS_STRTOUL) +unsigned long +ACE_OS_String::strtoul_emulation (const char *nptr, + char **endptr, + register int base) +{ + register const char *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; + cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = ULONG_MAX; + errno = ERANGE; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)s - 1 : (char *)nptr; + return (acc); +} +#endif /* ACE_LACKS_STRTOUL */ diff --git a/ace/OS_String.h b/ace/OS_String.h index 19a3e1f5a10..7a4c07ad489 100644 --- a/ace/OS_String.h +++ b/ace/OS_String.h @@ -44,8 +44,8 @@ public: * * Included are the functions defined in <cstring> and their <cwchar> * equivalents. - * - * @todo To be complete, we should add strcoll, strerror, and strxfrm. + * + * @todo To be complete, we should add strcoll, and strxfrm. */ //@{ @@ -119,6 +119,9 @@ public: static size_t strcspn (const wchar_t *s, const wchar_t *reject); #endif /* ACE_HAS_WCHAR */ + /// Returns a system error message. + static char *strerror (int errnum); + /// Finds the length of a string (char version). static size_t strlen (const char *s); @@ -233,16 +236,15 @@ public: * to_lower). * * @todo To be complete, we should add: isalnum, isalpha, iscntrl - * isdigit, isgraph, islower, ispunct, isupper, isxdigit, and - * toupper. + * isdigit, isgraph, islower, ispunct, isupper, isxdigit, and toupper. */ //@{ /// Returns true if the character is a printable character. - static int ace_isprint (const ACE_TCHAR s); + static int ace_isprint (const ACE_TCHAR c); /// Returns true if the character is a space character. - static int ace_isspace (const ACE_TCHAR s); + static int ace_isspace (const ACE_TCHAR c); /// Converts a character to lower case (char version). static int to_lower (int c); @@ -344,8 +346,10 @@ public: /// Finds the next token in a string (safe char version). static char *strtok_r (char *s, const char *tokens, char **lasts); +#if !defined (ACE_LACKS_STRTOD) /// Converts a string to a double value (char version). static double strtod (const char *s, char **endptr); +#endif /* !ACE_LACKS_STRTOD */ #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD) /// Converts a string to a double value (wchar_t version). @@ -417,6 +421,17 @@ private: static const char *strchr_emulation (const char *s, int c); #endif /* ACE_LACKS_STRCHR */ +#if defined (ACE_LACKS_STRERROR) + /// Emulated strerror - Returns a system error message. + static char *strerror_emulation (int errnum); +#endif /* ACE_LACKS_STRERROR */ + +#if defined (ACE_LACKS_STRPBRK) + /// Emulated strpbrk - Searches for characters in a string. + static char *strpbrk_emulation (const char *string, + const char *charset); +#endif /* ACE_LACKS_STRPBRK */ + #if defined (ACE_LACKS_STRRCHR) /// Emulated strrchr (char version) - Finds the last occurance of a /// character in a string. @@ -432,6 +447,22 @@ private: static char *strtok_r_emulation (char *s, const char *tokens, char **lasts); #endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ +#if defined (ACE_LACKS_STRSPN) + /// Emulated wcsspn. + static size_t strspn_emulation (const char *string, + const char *charset); +#endif /* ACE_LACKS_STRSPN */ + +#if defined (ACE_LACKS_STRTOL) + static long strtol_emulation (const char *nptr, char **endptr, int base); +#endif /* ACE_LACKS_STRTOL */ + +#if defined (ACE_LACKS_STRTOUL) + static unsigned long strtoul_emulation (const char *nptr, + char **endptr, + int base); +#endif /* ACE_LACKS_STRTOUL */ + #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT) /// Emulated wcscat - Appends a string. static wchar_t *wcscat_emulation (wchar_t *destination, @@ -511,7 +542,7 @@ private: #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */ #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN) - /// Emulated wcsspn. + /// Emulated wcscspn. static size_t wcscspn_emulation (const wchar_t *string, const wchar_t *reject); #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */ diff --git a/ace/OS_String.inl b/ace/OS_String.inl index 6a5337fa9fc..f723a560471 100644 --- a/ace/OS_String.inl +++ b/ace/OS_String.inl @@ -10,9 +10,9 @@ //============================================================================= #if defined (ACE_HAS_PACE) -# include "pace/string.h" -# include "pace/ctype.h" -# include "pace/stdlib.h" +# include /**/ "pace/string.h" +# include /**/ "pace/ctype.h" +# include /**/ "pace/stdlib.h" #endif /* ACE_HAS_PACE */ // Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. @@ -150,9 +150,9 @@ ACE_OS_String::strchr (char *s, int c) { #if defined (ACE_HAS_PACE) return pace_strchr (s, c); -#elif defined (ACE_HAS_WINCE) +#elif defined (ACE_LACKS_STRCHR) return ACE_OS_String::strchr_emulation (s, c); -#else /* ! ACE_HAS_WINCE */ +#else /* ! ACE_LACKS_STRCHR */ return ::strchr (s, c); #endif /* ACE_HAS_PACE */ } @@ -234,6 +234,16 @@ ACE_OS_String::strcspn (const wchar_t *s, const wchar_t *reject) } #endif /* ACE_HAS_WCHAR */ +ACE_INLINE char * +ACE_OS_String::strerror (int errnum) +{ +#if defined (ACE_LACKS_STRERROR) + return ACE_OS_String::strerror_emulation (errnum); +#else /* ACE_LACKS_STRERROR */ + return ::strerror (errnum); +#endif /* ACE_LACKS_STRERROR */ +} + ACE_INLINE size_t ACE_OS_String::strlen (const char *s) { @@ -327,6 +337,8 @@ ACE_OS_String::strpbrk (const char *s1, const char *s2) { #if defined (ACE_HAS_PACE) return (const char*) pace_strpbrk (s1, s2); +#elif defined (ACE_LACKS_STRPBRK) + return ACE_OS_String::strpbrk_emulation (s1, s2); #else /* ACE_HAS_PACE */ return (const char *) ::strpbrk (s1, s2); #endif /* ACE_HAS_PACE */ @@ -349,9 +361,11 @@ ACE_OS_String::strpbrk (char *s1, const char *s2) { #if defined (ACE_HAS_PACE) return pace_strpbrk (s1, s2); +#elif defined (ACE_LACKS_STRPBRK) + return ACE_OS_String::strpbrk_emulation (s1, s2); #else /* ACE_HAS_PACE */ return ::strpbrk (s1, s2); -#endif /* ! ACE_HAS_WINCE */ +#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -413,6 +427,8 @@ ACE_OS_String::strspn (const char *s, const char *t) { #if defined (ACE_HAS_PACE) return pace_strspn (s, t); +#elif defined (ACE_LACKS_STRSPN) + return ACE_OS_String::strspn_emulation (s, t); #else /* ACE_HAS_PACE */ return ::strspn (s, t); #endif /* ACE_HAS_PACE */ @@ -492,28 +508,27 @@ ACE_OS_String::strtok (wchar_t *s, const wchar_t *tokens) } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */ - ACE_INLINE int -ACE_OS_String::ace_isprint (const ACE_TCHAR s) +ACE_OS_String::ace_isprint (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) - return ::iswprint (s); + return iswprint (c); #elif defined (ACE_HAS_PACE) - return pace_isprint (s); + return pace_isprint (c); #else /* ACE_USES_WCHAR */ - return isprint (s); + return isprint (c); #endif /* ACE_USES_WCHAR */ } ACE_INLINE int -ACE_OS_String::ace_isspace (const ACE_TCHAR s) +ACE_OS_String::ace_isspace (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) - return ::iswspace (s); + return iswspace (c); #elif defined (ACE_HAS_PACE) - return pace_isspace (s); + return pace_isspace (c); #else /* ACE_HAS_PACE */ - return isspace (s); + return isspace (c); #endif /* ACE_HAS_PACE */ } @@ -661,6 +676,7 @@ ACE_OS_String::strtok_r (char *s, const char *tokens, char **lasts) #endif /* (ACE_HAS_REENTRANT_FUNCTIONS) */ } +#if !defined (ACE_LACKS_STRTOD) ACE_INLINE double ACE_OS_String::strtod (const char *s, char **endptr) { @@ -670,6 +686,7 @@ ACE_OS_String::strtod (const char *s, char **endptr) return ::strtod (s, endptr); #endif /* ACE_HAS_PACE */ } +#endif /* !ACE_LACKS_STRTOD */ #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD) ACE_INLINE double @@ -684,6 +701,8 @@ ACE_OS_String::strtol (const char *s, char **ptr, int base) { #if defined (ACE_HAS_PACE) return pace_strtol (s, ptr, base); +#elif defined (ACE_LACKS_STRTOL) + return ACE_OS_String::strtol_emulation (s, ptr, base); #else /* ACE_HAS_PACE */ return ::strtol (s, ptr, base); #endif /* ACE_HAS_PACE */ @@ -702,7 +721,9 @@ ACE_OS_String::strtoul (const char *s, char **ptr, int base) { #if defined (ACE_HAS_PACE) return pace_strtoul (s, ptr, base); -#else /* ACE_HAS_PACE */ +#elif defined (ACE_LACKS_STRTOUL) + return ACE_OS_String::strtoul_emulation (s, ptr, base); +#else /* ACE_HAS_PACE */ return ::strtoul (s, ptr, base); #endif /* ACE_HAS_PACE */ } diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp index d22ee247dd5..33c0f266fcd 100644 --- a/ace/SUN_Proactor.cpp +++ b/ace/SUN_Proactor.cpp @@ -1,6 +1,5 @@ // $Id$ -#define ACE_BUILD_DLL #include "ace/SUN_Proactor.h" #if defined (ACE_HAS_AIO_CALLS) && defined (sun) diff --git a/ace/Service_Config.i b/ace/Service_Config.i index 5ed6f3dd09f..c6cdfd948f2 100644 --- a/ace/Service_Config.i +++ b/ace/Service_Config.i @@ -57,13 +57,13 @@ ACE_Service_Config::signal_handler (ACE_Sig_Adapter *signal_handler) signal_handler_ = signal_handler; } -#if defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) && !defined (ACE_USES_WCHAR) // We must provide these function to bridge Svc_Conf parser with ACE. ACE_INLINE int ACE_Service_Config::initialize (const ACE_Service_Type *sp, char parameters[]) { - return ACE_Service_Config::initialize (sp, parameters); + return ACE_Service_Config::initialize (sp, ACE_TEXT_CHAR_TO_TCHAR (parameters)); } ACE_INLINE int @@ -76,18 +76,18 @@ ACE_Service_Config::initialize (const char svc_name[], char parameters[]) ACE_INLINE int ACE_Service_Config::resume (const char svc_name[]) { - return ACE_Service_Config::resume (svc_name); + return ACE_Service_Config::resume (ACE_TEXT_CHAR_TO_TCHAR (svc_name)); } ACE_INLINE int ACE_Service_Config::suspend (const char svc_name[]) { - return ACE_Service_Config::suspend (svc_name); + return ACE_Service_Config::suspend (ACE_TEXT_CHAR_TO_TCHAR (svc_name)); } ACE_INLINE int ACE_Service_Config::remove (const char svc_name[]) { - return ACE_Service_Config::remove (svc_name); + return ACE_Service_Config::remove (ACE_TEXT_CHAR_TO_TCHAR (svc_name)); } -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */ diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index 94fa96ca963..4c285ddbebf 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -5,6 +5,7 @@ #include "ace/Log_Msg.h" #include "ace/Handle_Set.h" #include "ace/Auto_Ptr.h" +#include "ace/SString.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/Sock_Connect.i" @@ -12,6 +13,45 @@ ACE_RCSID(ace, Sock_Connect, "$Id$") +#if defined (ACE_WIN32) +// Return value in buffer for a key/name pair from the Windows +// Registry up to buf_len size. + +static int +get_reg_value (const ACE_TCHAR *key, + const ACE_TCHAR *name, + ACE_TCHAR *buffer, + DWORD &buf_len) +{ + HKEY hk; + DWORD buf_type; + LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE, + key, + 0, + KEY_READ, + &hk); + // 1. open key that defines the interfaces used for TCP/IP? + if (rc != ERROR_SUCCESS) + // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc); + return -1; + + rc = ACE_TEXT_RegQueryValueEx (hk, + name, + 0, + &buf_type, + (u_char *) buffer, + &buf_len); + if (rc != ERROR_SUCCESS) + { + // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); + RegCloseKey (hk); + return -2; + } + + ::RegCloseKey (hk); + return 0; +} +#endif /* ACE_WIN32 */ // Bind socket to an unused port. diff --git a/ace/Thread_Adapter.inl b/ace/Thread_Adapter.inl index 8bb1cd917a8..53855b300cc 100644 --- a/ace/Thread_Adapter.inl +++ b/ace/Thread_Adapter.inl @@ -1,18 +1,5 @@ // $Id$ -ACE_INLINE long -ACE_OS_Thread_Descriptor::flags (void) const -{ - return flags_; -} - - -ACE_INLINE -ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags) - : flags_ (flags) -{ -} - ACE_INLINE ACE_Thread_Manager * ACE_Thread_Adapter::thr_mgr (void) { diff --git a/ace/ace_ce.dsw b/ace/ace.vcw index 51d98e25343..e07a7e04a2c 100644 --- a/ace/ace_ce.dsw +++ b/ace/ace.vcw @@ -1,29 +1,44 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ace_dll_ce"=.\ace_dll_ce.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ace"=.\ace_dll.vcp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name ace_os + End Project Dependency +}}} + +############################################################################### + +Project: "ace_os"=.\ace_os_dll.vcp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index ce5dfd96969..9d1c68a9785 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -2178,6 +2178,25 @@ SOURCE=.\OS_Dirent.cpp # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -4832,6 +4851,10 @@ SOURCE=.\OS_Dirent.h # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.h
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.h
# End Source File
# Begin Source File
@@ -5796,6 +5819,10 @@ SOURCE=.\OS_Dirent.inl # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.inl
# End Source File
# Begin Source File
diff --git a/ace/ace_dll.vcp b/ace/ace_dll.vcp new file mode 100644 index 00000000000..57481074909 --- /dev/null +++ b/ace/ace_dll.vcp @@ -0,0 +1,911 @@ +# Microsoft eMbedded Visual Tools Project File - Name="ace" - Package Owner=<4> +# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02 +# TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102 +# TARGTYPE "Win32 (WCE ARM) Dynamic-Link Library" 0x8502 +# TARGTYPE "Win32 (WCE SH4) Dynamic-Link Library" 0x8602 +# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202 + +CFG=ace - Win32 (WCE MIPS) Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ace_dll.vcn". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ace_dll.vcn" CFG="ace - Win32 (WCE MIPS) Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ace - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library") +!MESSAGE "ace - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +# PROP ATL_Project 2 + +!IF "$(CFG)" == "ace - Win32 (WCE MIPS) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "MIPSRel" +# PROP BASE Intermediate_Dir "MIPSRel" +# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/MIPSRel" +# PROP Intermediate_Dir "DLL/MIPSRel" +# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +CPP=clmips.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE MIPS) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "MIPSDbg" +# PROP BASE Intermediate_Dir "MIPSDbg" +# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/MIPSDbg" +# PROP Intermediate_Dir "DLL/MIPSDbg" +# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +CPP=clmips.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE SH4) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "SH4Rel" +# PROP BASE Intermediate_Dir "SH4Rel" +# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/SH4Rel" +# PROP Intermediate_Dir "DLL/SH4Rel" +# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Qsh4 /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Qsh4 /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE SH4) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "SH4Dbg" +# PROP BASE Intermediate_Dir "SH4Dbg" +# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/SH4Dbg" +# PROP Intermediate_Dir "DLL/SH4Dbg" +# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Qsh4 /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Qsh4 /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE SH3) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "SH3Rel" +# PROP BASE Intermediate_Dir "SH3Rel" +# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/SH3Rel" +# PROP Intermediate_Dir "DLL/SH3Rel" +# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +PFILE=pfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE SH3) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "SH3Dbg" +# PROP BASE Intermediate_Dir "SH3Dbg" +# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/SH3Dbg" +# PROP Intermediate_Dir "DLL/SH3Dbg" +# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +PFILE=pfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE ARM) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ARMRel" +# PROP BASE Intermediate_Dir "ARMRel" +# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/ARMRel" +# PROP Intermediate_Dir "DLL/ARMRel" +# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +CPP=clarm.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE ARM) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ARMDbg" +# PROP BASE Intermediate_Dir "ARMDbg" +# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/ARMDbg" +# PROP Intermediate_Dir "DLL/ARMDbg" +# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +CPP=clarm.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM +# ADD LINK32 winsock.lib commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE x86em) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "X86EMRel" +# PROP BASE Intermediate_Dir "X86EMRel" +# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/X86EMRel" +# PROP Intermediate_Dir "DLL/X86EMRel" +# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +EMPFILE=empfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Gz /Oxs /c +# ADD CPP /nologo /W3 /I "../" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Gz /Oxs /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 +# ADD LINK32 winsock.lib $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 + +!ELSEIF "$(CFG)" == "ace - Win32 (WCE x86em) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "X86EMDbg" +# PROP BASE Intermediate_Dir "X86EMDbg" +# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/X86EMDbg" +# PROP Intermediate_Dir "DLL/X86EMDbg" +# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +EMPFILE=empfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "ACE_EXPORTS" /YX /Gz /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_BUILD_DLL" /Gz /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 +# ADD LINK32 winsock.lib $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 + +!ENDIF + +# Begin Target + +# Name "ace - Win32 (WCE MIPS) Release" +# Name "ace - Win32 (WCE MIPS) Debug" +# Name "ace - Win32 (WCE SH4) Release" +# Name "ace - Win32 (WCE SH4) Debug" +# Name "ace - Win32 (WCE SH3) Release" +# Name "ace - Win32 (WCE SH3) Debug" +# Name "ace - Win32 (WCE ARM) Release" +# Name "ace - Win32 (WCE ARM) Debug" +# Name "ace - Win32 (WCE x86em) Release" +# Name "ace - Win32 (WCE x86em) Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\ACE.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Activation_Queue.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Active_Map_Manager.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Addr.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\ARGV.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Asynch_IO.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Based_Pointer_Repository.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Basic_Stats.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Basic_Types.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Containers.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\DLL.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Dump.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Dynamic.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Event_Handler.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Flag_Manip.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Functor.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Get_Opt.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Handle_Set.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\High_Res_Timer.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\INET_Addr.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\IO_Cntl_Msg.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\IO_SAP.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\IPC_SAP.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Lib_Find.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Log_Msg.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Log_Msg_Backend.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Log_Msg_Callback.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Log_Msg_IPC.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Log_Record.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Malloc.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Malloc_Allocator.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Mem_Map.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Memory_Pool.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Message_Block.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Message_Queue.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Method_Request.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Object_Manager.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Obstack.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Parse_Node.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Pipe.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Process.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Process_Manager.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Process_Mutex.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Profile_Timer.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Reactor.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Sched_Params.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Select_Reactor.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Select_Reactor_Base.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Service_Config.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Service_Manager.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Service_Object.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Service_Repository.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Service_Types.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Shared_Object.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Signal.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Acceptor.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_CODgram.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Sock_Connect.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Connector.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Dgram.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Dgram_Bcast.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Dgram_Mcast.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_IO.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SOCK_Stream.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\SString.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Stats.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Strategies.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Svc_Conf_l.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Svc_Conf_y.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Synch.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Synch_Options.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\System_Time.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Task.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread_Adapter.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread_Control.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread_Exit.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread_Manager.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Token.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\TP_Reactor.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Trace.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\WFMO_Reactor.cpp + + +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/ace/ace_dll_ce.dsp b/ace/ace_dll_ce.dsp deleted file mode 100644 index 6db1b8793c9..00000000000 --- a/ace/ace_dll_ce.dsp +++ /dev/null @@ -1,709 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ace_dll_ce" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
-# TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
-# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
-
-CFG=ace_dll_ce - Win32 (WCE SH3) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ace_dll_ce.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ace_dll_ce.mak" CFG="ace_dll_ce - Win32 (WCE SH3) Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ace_dll_ce - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")
-!MESSAGE "ace_dll_ce - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")
-!MESSAGE "ace_dll_ce - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
-!MESSAGE "ace_dll_ce - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
-!MESSAGE "ace_dll_ce - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")
-!MESSAGE "ace_dll_ce - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath "H/PC Ver. 2.00"
-# PROP WCE_FormatVersion "6.0"
-
-!IF "$(CFG)" == "ace_dll_ce - Win32 (WCE SH3) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "WCESH3Rel"
-# PROP BASE Intermediate_Dir "WCESH3Rel"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "DLL\Release\SH3"
-# PROP Intermediate_Dir "DLL\Release\SH3"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-PFILE=pfile.exe
-CPP=shcl.exe
-# ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ACE_DLL_CE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "../" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
-# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
-# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
-# ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"DLL\Release\SH3\ace.dll" /subsystem:$(CESubsystem) /STACK:65536,4096
-# SUBTRACT LINK32 /pdb:none /nodefaultlib
-
-!ELSEIF "$(CFG)" == "ace_dll_ce - Win32 (WCE SH3) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "WCESH3Dbg"
-# PROP BASE Intermediate_Dir "WCESH3Dbg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL\Debug\SH3"
-# PROP Intermediate_Dir "DLL\Debug\SH3"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-PFILE=pfile.exe
-CPP=shcl.exe
-# ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ACE_DLL_CE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "../" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
-# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
-# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
-# ADD LINK32 commctrl.lib coredll.lib winsock.lib corelibc.lib /nologo /dll /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"DLL\Debug\SH3\aced.dll" /subsystem:$(CESubsystem) /STACK:65536,4096
-# SUBTRACT LINK32 /pdb:none /nodefaultlib
-
-!ELSEIF "$(CFG)" == "ace_dll_ce - Win32 (WCE MIPS) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ace_dll_ce___Win32__WCE_MIPS__Release"
-# PROP BASE Intermediate_Dir "ace_dll_ce___Win32__WCE_MIPS__Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "DLL\Release\MIPS"
-# PROP Intermediate_Dir "DLL\Release\MIPS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /YX /QMRWCE /c
-# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I "../" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /QMRWCE /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
-# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
-# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
-# ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"DLL\Release\MIPS\ace.dll" /subsystem:$(CESubsystem)
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "ace_dll_ce - Win32 (WCE MIPS) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ace_dll_ce___Win32__WCE_MIPS__Debug"
-# PROP BASE Intermediate_Dir "ace_dll_ce___Win32__WCE_MIPS__Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL\Debug\MIPS"
-# PROP Intermediate_Dir "DLL\Debug\MIPS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /YX /QMRWCE /c
-# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "../" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_BUILD_DLL" /QMRWCE /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
-# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 $(CEx86Corelibc) winsock.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
-# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
-# ADD LINK32 winsock.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"DLL\Debug\MIPS\aced.dll" /subsystem:$(CESubsystem)
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "ace_dll_ce - Win32 (WCE x86em) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "x86emRel"
-# PROP BASE Intermediate_Dir "x86emRel"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "DLL\Release\x86\"
-# PROP Intermediate_Dir "DLL\Release\x86\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-EMPFILE=empfile.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /ML /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "ACE_DLL_CE_EXPORTS" /YX /c
-# ADD CPP /nologo /W3 /O2 /I "../" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "ACE_BUILD_DLL" /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /nodefaultlib /out:"DLL\Release\x86\ace.dll" /windowsce:emulation
-
-!ELSEIF "$(CFG)" == "ace_dll_ce - Win32 (WCE x86em) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "x86emDbg"
-# PROP BASE Intermediate_Dir "x86emDbg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL\Debug\x86"
-# PROP Intermediate_Dir "DLL\Debug\x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-EMPFILE=empfile.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "ACE_DLL_CE_EXPORTS" /YX /c
-# ADD CPP /nologo /W3 /Gm /Zi /Od /I "../" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "ACE_BUILD_DLL" /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /nodefaultlib /out:"DLL\Debug\x86\aced.dll" /windowsce:emulation
-
-!ENDIF
-
-# Begin Target
-
-# Name "ace_dll_ce - Win32 (WCE SH3) Release"
-# Name "ace_dll_ce - Win32 (WCE SH3) Debug"
-# Name "ace_dll_ce - Win32 (WCE MIPS) Release"
-# Name "ace_dll_ce - Win32 (WCE MIPS) Debug"
-# Name "ace_dll_ce - Win32 (WCE x86em) Release"
-# Name "ace_dll_ce - Win32 (WCE x86em) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ACE.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Activation_Queue.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Active_Map_Manager.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Addr.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ARGV.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Asynch_IO.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Based_Pointer_Repository.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Basic_Types.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Containers.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\DLL.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dump.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dynamic.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Event_Handler.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Functor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Get_Opt.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Handle_Set.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\High_Res_Timer.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\INET_Addr.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\IO_Cntl_Msg.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\IO_SAP.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\IPC_SAP.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Log_Msg.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Log_Record.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Malloc.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Mem_Map.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Memory_Pool.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Message_Block.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Message_Queue.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Method_Request.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_Manager.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Obstack.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\OS.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\OS_Dirent.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\OS_Memory.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\OS_String.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Parse_Node.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Pipe.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Process.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Process_Manager.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Profile_Timer.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Reactor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sched_Params.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Select_Reactor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Select_Reactor_Base.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Service_Config.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Service_Manager.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Service_Object.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Service_Repository.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Service_Types.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Shared_Object.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Signal.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Acceptor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_CODgram.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Connector.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Dgram.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Dgram_Bcast.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Dgram_Mcast.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_IO.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SOCK_Stream.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\SString.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Stats.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Strategies.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Svc_Conf_l.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Svc_Conf_y.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Synch.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Synch_Options.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\System_Time.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Task.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Thread.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Thread_Manager.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Token.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\TP_Reactor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Trace.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\WFMO_Reactor.cpp
-
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\XtReactor.cpp
-
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index ba24e7e385d..cd998f17900 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -2134,6 +2134,25 @@ SOURCE=.\OS_Dirent.cpp # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -4773,6 +4792,10 @@ SOURCE=.\OS_Dirent.h # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.h
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.h
# End Source File
# Begin Source File
@@ -5745,6 +5768,10 @@ SOURCE=.\OS_Dirent.inl # End Source File
# Begin Source File
+SOURCE=.\OS_Errno.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Log_Msg_Attributes.inl
# End Source File
# Begin Source File
diff --git a/ace/ace_os_dll.vcp b/ace/ace_os_dll.vcp new file mode 100644 index 00000000000..33b12812af8 --- /dev/null +++ b/ace/ace_os_dll.vcp @@ -0,0 +1,569 @@ +# Microsoft eMbedded Visual Tools Project File - Name="ace_os" - Package Owner=<4> +# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02 +# TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102 +# TARGTYPE "Win32 (WCE ARM) Dynamic-Link Library" 0x8502 +# TARGTYPE "Win32 (WCE SH4) Dynamic-Link Library" 0x8602 +# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202 + +CFG=ace_os - Win32 (WCE MIPS) Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ace_os_dll.vcn". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ace_os_dll.vcn" CFG="ace_os - Win32 (WCE MIPS) Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ace_os - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library") +!MESSAGE "ace_os - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +# PROP ATL_Project 2 + +!IF "$(CFG)" == "ace_os - Win32 (WCE MIPS) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "MIPSRel" +# PROP BASE Intermediate_Dir "MIPSRel" +# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/MIPSRel" +# PROP Intermediate_Dir "DLL/MIPSRel" +# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +CPP=clmips.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE MIPS) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "MIPSDbg" +# PROP BASE Intermediate_Dir "MIPSDbg" +# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/MIPSDbg" +# PROP Intermediate_Dir "DLL/MIPSDbg" +# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r +CPP=clmips.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE SH4) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "SH4Rel" +# PROP BASE Intermediate_Dir "SH4Rel" +# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/SH4Rel" +# PROP Intermediate_Dir "DLL/SH4Rel" +# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Qsh4 /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Qsh4 /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE SH4) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "SH4Dbg" +# PROP BASE Intermediate_Dir "SH4Dbg" +# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/SH4Dbg" +# PROP Intermediate_Dir "DLL/SH4Dbg" +# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Qsh4 /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Qsh4 /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4 + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE SH3) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "SH3Rel" +# PROP BASE Intermediate_Dir "SH3Rel" +# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/SH3Rel" +# PROP Intermediate_Dir "DLL/SH3Rel" +# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +PFILE=pfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE SH3) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "SH3Dbg" +# PROP BASE Intermediate_Dir "SH3Dbg" +# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/SH3Dbg" +# PROP Intermediate_Dir "DLL/SH3Dbg" +# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +PFILE=pfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r +CPP=shcl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3 + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE ARM) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ARMRel" +# PROP BASE Intermediate_Dir "ARMRel" +# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/ARMRel" +# PROP Intermediate_Dir "DLL/ARMRel" +# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +CPP=clarm.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "../" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Oxs /M$(CECrtMT) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM +# ADD LINK32 commctrl.lib coredll.lib winsock.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE ARM) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ARMDbg" +# PROP BASE Intermediate_Dir "ARMDbg" +# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/ARMDbg" +# PROP Intermediate_Dir "DLL/ARMDbg" +# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r +CPP=clarm.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /M$(CECrtMTDebug) /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM +# ADD LINK32 winsock.lib commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE x86em) Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "X86EMRel" +# PROP BASE Intermediate_Dir "X86EMRel" +# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DLL/X86EMRel" +# PROP Intermediate_Dir "DLL/X86EMRel" +# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +EMPFILE=empfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Gz /Oxs /c +# ADD CPP /nologo /W3 /I "../" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Gz /Oxs /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 +# ADD LINK32 winsock.lib $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 + +!ELSEIF "$(CFG)" == "ace_os - Win32 (WCE x86em) Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "X86EMDbg" +# PROP BASE Intermediate_Dir "X86EMDbg" +# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DLL/X86EMDbg" +# PROP Intermediate_Dir "DLL/X86EMDbg" +# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}" +# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +EMPFILE=empfile.exe +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "ACE_OS_EXPORTS" /YX /Gz /c +# ADD CPP /nologo /W3 /Zi /Od /I "../" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ACE_OS_BUILD_DLL" /Gz /c +# SUBTRACT CPP /YX +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 +# ADD LINK32 winsock.lib $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86 + +!ENDIF + +# Begin Target + +# Name "ace_os - Win32 (WCE MIPS) Release" +# Name "ace_os - Win32 (WCE MIPS) Debug" +# Name "ace_os - Win32 (WCE SH4) Release" +# Name "ace_os - Win32 (WCE SH4) Debug" +# Name "ace_os - Win32 (WCE SH3) Release" +# Name "ace_os - Win32 (WCE SH3) Debug" +# Name "ace_os - Win32 (WCE ARM) Release" +# Name "ace_os - Win32 (WCE ARM) Debug" +# Name "ace_os - Win32 (WCE x86em) Release" +# Name "ace_os - Win32 (WCE x86em) Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\Base_Thread_Adapter.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_Dirent.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_Errno.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_Log_Msg_Attributes.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_Memory.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_String.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_Thread_Adapter.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\OS_TLI.cpp + + +# End Source File +# Begin Source File + +SOURCE=.\Thread_Hook.cpp + + +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm" +# Begin Source File + +SOURCE=.\ace_wchar.h +# End Source File +# Begin Source File + +SOURCE=.\Base_Thread_Adapter.h +# End Source File +# Begin Source File + +SOURCE=".\config-all.h" +# End Source File +# Begin Source File + +SOURCE=.\OS.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Dirent.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Errno.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Export.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Log_Msg_Attributes.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Memory.h +# End Source File +# Begin Source File + +SOURCE=.\OS_String.h +# End Source File +# Begin Source File + +SOURCE=.\OS_Thread_Adapter.h +# End Source File +# Begin Source File + +SOURCE=.\OS_TLI.h +# End Source File +# Begin Source File + +SOURCE=.\Thread_Hook.h +# End Source File +# End Group +# Begin Group "Inline Files" + +# PROP Default_Filter "inl;i" +# Begin Source File + +SOURCE=.\ace_wchar.inl +# End Source File +# Begin Source File + +SOURCE=.\Base_Thread_Adapter.inl +# End Source File +# Begin Source File + +SOURCE=.\Basic_Types.i +# End Source File +# Begin Source File + +SOURCE=.\OS.i +# End Source File +# Begin Source File + +SOURCE=.\OS_Dirent.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_Errno.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_Log_Msg_Attributes.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_Memory.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_String.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_Thread_Adapter.inl +# End Source File +# Begin Source File + +SOURCE=.\OS_TLI.inl +# End Source File +# End Group +# End Target +# End Project diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index a6ea2ae078d..d997dba8fb6 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -4,6 +4,10 @@ #define ACE_CONFIG_WINCE_H #include "ace/pre.h" +#if !defined (UNDER_CE) +#error Define UNDER_CE to version (i.e. 300 = 3.0) +#endif /* UNDER_CE */ + #if !defined (ACE_HAS_WINCE) #define ACE_HAS_WINCE 1 #endif @@ -19,6 +23,9 @@ // the information using getenv. #define ACE_DEFAULT_LD_SEARCH_PATH ACE_LIB_TEXT (".\\;\\windows") +#define ACE_LACKS_SYS_TYPES_H + + // CE is not NT. #if defined (ACE_HAS_WINNT4) # undef ACE_HAS_WINNT4 @@ -29,12 +36,6 @@ #define ACE_LACKS_ACE_OTHER #define ACE_LACKS_MSG_WFMO -// You must use MFC with ACE on CE. -//#if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) -//# undef ACE_HAS_MFC -//#endif /* ACE_HAS_MFC */ -//#define ACE_HAS_MFC 1 - #define ACE_HAS_WCHAR #if !defined (ACE_USES_WCHAR) @@ -154,6 +155,22 @@ typedef void FILE; #define ACE_LACKS_BSEARCH #define ACE_LACKS_SOCKET_BUFSIZ #define ACE_LACKS_ISATTY +#define ACE_LACKS_STRERROR + +#define ERRMAX 256 /* Needed for following define */ +#define ACE_LACKS_SYS_NERR /* Needed for sys_nerr in Log_Msg.cpp */ + + +#define ACE_LACKS_CUSERID +#define ACE_LACKS_CHDIR +#define ACE_LACKS_ENV +#define ACE_LACKS_HOSTNAME + +#if defined (_WIN32_WCE_EMULATION) +// @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) +// under emulation. So for right now, exclude it. +#define ACE_LACKS_QSORT +#endif /* _WIN32_WCE_EMULATION && UNDER_CE == 300 */ // @@ Followings are used to keep existing programs happy. @@ -162,7 +179,7 @@ typedef void FILE; # define BUFSIZ 1024 #endif /* BUFSIZ */ -typedef void (*__sighandler_t)(int); // keep Signal compilation happy +typedef void (__cdecl * __sighandler_t)(int); // keep Signal compilation happy typedef long off_t; #if defined (UNDER_CE) && (UNDER_CE > 200) @@ -182,12 +199,24 @@ typedef long off_t; #define ACE_LACKS_MALLOC_H // We do have malloc.h, but don't use it. #endif /* UNDER_CE && UNDER_CE > 201 */ +#if (UNDER_CE < 300) +#define ACE_LACKS_STRPBRK +#define ACE_LACKS_STRSPN +#define ACE_LACKS_STRTOD +#define ACE_LACKS_STRTOL +#define ACE_LACKS_STRTOUL +#endif /* UNDER_CE < 300 */ + #if defined (UNDER_CE) && (UNDER_CE >= 211) #define ACE_HAS_WINCE_BROKEN_ERRNO #define _MAX_FNAME 255 #endif /* UNDER_CE && UNDER_CE >= 211 */ #define ACE_HAS_STRDUP_EMULATION +#define ACE_HAS_WINSOCK2 0 + +// CE doesn't have <sys/types.h> instead <types.h> +#define ACE_HAS_FLAT_TYPES_H // @@ This needs to be defined and initialized as a static. (Singleton?) #define ACE_DEFAULT_LOG_STREAM 0 diff --git a/ace/config-all.h b/ace/config-all.h index 90bd9f4d9d7..5caf4434511 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -335,17 +335,7 @@ // errno stuff // ============================================================================ -#if defined (ACE_HAS_H_ERRNO) -void herror (const char *str); -#endif /* ACE_HAS_H_ERRNO */ - -#if !defined (ACE_HAS_WINCE) -# include /**/ <errno.h> -#endif /* ACE_HAS_WINCE */ - -#if !defined (ACE_WIN32) && !defined (ACE_PSOS) && defined (ACE_LACKS_T_ERRNO) -extern int t_errno; -#endif /* ACE_WIN32 && !ACE_PSOS && ACE_LACKS_T_ERRNO */ +#include "OS_Errno.h" // ============================================================================ // ACE_NEW macros @@ -590,14 +580,6 @@ typedef void *(*ACE_THR_C_FUNC)(void *); // Miscellaneous macros // ============================================================================ -# if !defined (ENOSYS) -# define ENOSYS EFAULT /* Operation not supported or unknown error. */ -# endif /* !ENOSYS */ - -#if !defined (ENOTSUP) -# define ENOTSUP ENOSYS /* Operation not supported. */ -#endif /* !ENOTSUP */ - // This is used to indicate that a platform doesn't support a // particular feature. #if defined ACE_HAS_VERBOSE_NOTSUP diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index a5042f70222..7c3e248d545 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -125,7 +125,6 @@ // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! # define ACE_HAS_TLI_PROTOTYPES -# define ACE_HAS_GNU_CSTRING_H // Platform support linebuffered streaming is broken # define ACE_LACKS_LINEBUFFERED_STREAMBUF diff --git a/ace/config-win32.h b/ace/config-win32.h index 014b5fc33bc..be58dfd6b26 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -22,19 +22,19 @@ # endif /* PACE_HAS_ALL_POSIX_FUNCS */ # endif /* ACE_HAS_PACE */ -#if defined (ACE_HAS_WINCE) || defined (UNDER_CE) +#if defined (_WIN32_WCE) # include "ace/config-WinCE.h" -#endif /* ACE_HAS_WINCE */ - -#if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" -#elif defined (__BORLANDC__) -# include "ace/config-win32-borland.h" -#elif defined (__IBMCPP__) -# include "ace/config-win32-visualage.h" -#else -# error "Compiler does not seem to be supported" -#endif /* _MSC_VER */ +#endif /* _WIN32_WCE */ + +# if defined (_MSC_VER) +# include "ace/config-win32-msvc.h" +# elif defined (__BORLANDC__) +# include "ace/config-win32-borland.h" +# elif defined (__IBMCPP__) +# include "ace/config-win32-visualage.h" +# else +# error "Compiler does not seem to be supported" +# endif /* _MSC_VER */ #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_ENDTHREADEX(STATUS) ::_endthread () |