diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-11 09:14:29 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-11 09:14:29 +0000 |
| commit | 91dd9e57ac180aa565bfcce1e642ee3d54b81f71 (patch) | |
| tree | 536dc456cc200fb4496a4c52ec8e38ec076bc27c /ace | |
| parent | 235e66369a11e8022364c7f79046681effc3d5be (diff) | |
| download | ATCD-91dd9e57ac180aa565bfcce1e642ee3d54b81f71.tar.gz | |
Miscellaneous unix fixes.
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Log_Msg.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 2fd93134e93..d506c6bfa54 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -1149,7 +1149,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 's': #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) type = SKIP_SPRINTF; - ACE_OS::sprintf (bp, ACE_WIDE_TEXT ("%ls"), va_arg (argp, wchar_t *)); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%ls"), va_arg (argp, wchar_t *)); #else /* ACE_WIN32 && ACE_USES_WCHAR */ type = 1 + wpc; #endif /* ACE_WIN32 && ACE_USES_WCHAR */ @@ -1172,7 +1172,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) type = SKIP_SPRINTF; - ACE_OS::sprintf (bp, ACE_WIDE_TEXT ("%ls"), va_arg (argp, wchar_t *)); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%ls"), va_arg (argp, wchar_t *)); #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ break; case 'w': @@ -1183,9 +1183,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # else /* ACE_USES_WCHAR */ fp[1] = 'C'; # endif /* ACE_USES_WCHAR */ -#elif defined (ACE_HAS_WCHAR) +#elif defined (ACE_USES_WCHAR) type = SKIP_SPRINTF; - ACE_OS::sprintf (bp, ACE_WIDE_TEXT ("%lc"), va_arg (argp, wchar_t)); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%lc"), va_arg (argp, wint_t)); +#else /* ACE_WIN32 */ + fp[1] = 'u'; // Since this isn't really supported well #endif /* ACE_WIN32 */ break; case 'c': |