diff options
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 88f584c2ed1..dd7e904b36e 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -80,11 +80,11 @@ public: }; #endif /* ACE_MT_SAFE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log #elif defined (ACE_ANDROID) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat -#elif !defined (ACE_LACKS_UNIX_SYSLOG) && !defined (ACE_HAS_WINCE) +#elif !defined (ACE_LACKS_UNIX_SYSLOG) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_UNIX_Syslog #endif @@ -1262,12 +1262,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'P': // Process ID -#if defined (ACE_OPENVMS) - // Print the process id in hex on OpenVMS. - ACE_OS::strcpy (fp, ACE_TEXT ("x")); -#else ACE_OS::strcpy (fp, ACE_TEXT ("d")); -#endif if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1400,11 +1395,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # if defined (ACE_WIN32) // Windows uses 'c' for a wide character ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else // Other platforms behave differently -# if defined (HPUX) // HP-Unix compatible - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else // Other ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ # endif # else /* ACE_USES_WCHAR */ @@ -1822,9 +1813,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ @@ -1832,7 +1821,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ +# endif /* ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); @@ -1858,11 +1847,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this_len = ACE_OS::sprintf (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, wint_t)); @@ -1894,11 +1879,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ #else /* ACE_WIN32 */ ACE_OS::strcpy (fp, ACE_TEXT ("u")); #endif /* ACE_WIN32 */ @@ -1941,11 +1922,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -2518,7 +2495,7 @@ bool ACE_Log_Formatter::process_conversion () ACE_OS::strcpy (this->fp_, "ls"); return false; case 'Z': -#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) || defined HPUX +#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) ACE_OS::strcpy (this->fp_, "S"); #elif defined ACE_WIN32 ACE_OS::strcpy (this->fp_, "s"); |