diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-05 03:28:48 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-05 03:28:48 +0000 |
| commit | b7f5f272e42454cc1ec53833e0e17e6242397d31 (patch) | |
| tree | 88a49032eb7bca42317391938fb2b0c9d2b23858 | |
| parent | 84fe5584b4e402d9c75973163ebd441032497744 (diff) | |
| download | ATCD-b7f5f272e42454cc1ec53833e0e17e6242397d31.tar.gz | |
ChangeLogTag:Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 6 | ||||
| -rw-r--r-- | ace/Log_Msg_NT_Event_Log.h | 4 | ||||
| -rw-r--r-- | ace/OS.cpp | 2 |
6 files changed, 30 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index f822088c5fe..8c5def77145 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.h: + * ace/OS.cpp: + + Disabled Log_Msg_NT_Event_Log on Windows CE. + Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> * etc/tao.doxygen: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f822088c5fe..8c5def77145 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.h: + * ace/OS.cpp: + + Disabled Log_Msg_NT_Event_Log on Windows CE. + Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> * etc/tao.doxygen: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f822088c5fe..8c5def77145 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.h: + * ace/OS.cpp: + + Disabled Log_Msg_NT_Event_Log on Windows CE. + Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> * etc/tao.doxygen: diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 8eec36f8fe9..30fe7f6aea8 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -120,7 +120,7 @@ int ACE_Log_Msg_Manager::init_backend (const u_long *flags) { ACE_NO_HEAP_CHECK; -#if defined (WIN32) +#if defined (WIN32) && !defined (ACE_HAS_WINCE) // Allocate the ACE_Log_Msg_Backend instance. if (ACE_BIT_ENABLED (ACE_Log_Msg_Manager::log_backend_flags_, ACE_Log_Msg::SYSLOG)) ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_, @@ -130,12 +130,12 @@ int ACE_Log_Msg_Manager::init_backend (const u_long *flags) ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_, ACE_Log_Msg_IPC, -1); -#else /* WIN32 */ +#else /* WIN32 && !ACE_HAS_WINCE */ // Allocate the ACE_Log_Msg IPC instance. ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_, ACE_Log_Msg_IPC, -1); -#endif /* WIN32 */ +#endif /* WIN32 && !ACE_HAS_WINCE */ } return 0; diff --git a/ace/Log_Msg_NT_Event_Log.h b/ace/Log_Msg_NT_Event_Log.h index c0d0d3966f4..fe33a54ab28 100644 --- a/ace/Log_Msg_NT_Event_Log.h +++ b/ace/Log_Msg_NT_Event_Log.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) #include "ace/Log_Msg_Backend.h" @@ -55,7 +55,7 @@ private: HANDLE evlog_handle_; }; -#endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ #include "ace/post.h" #endif /* ACE_LOG_MSG_NT_EVENT_LOG_H */ diff --git a/ace/OS.cpp b/ace/OS.cpp index 050674d499f..ff9c038f317 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -34,7 +34,7 @@ OSVERSIONINFO ACE_OS::win32_versioninfo_; HINSTANCE ACE_OS::win32_resource_module_; -# if defined (ACE_OS_HAS_DLL) && (ACE_OS_HAS_DLL == 1) +# if defined (ACE_OS_HAS_DLL) && (ACE_OS_HAS_DLL == 1) && !defined (ACE_HAS_WINCE) // This function is called by the OS when the ACE DLL is loaded. We // use it to determine the default module containing ACE's resources. BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) |