diff options
| author | Steve Huston <shuston@riverace.com> | 2001-08-04 02:16:30 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2001-08-04 02:16:30 +0000 |
| commit | e8480565c7a9b486254ecc42283b56e1783a2985 (patch) | |
| tree | e15d2d123a3099bb48d002847ab438e32b18904e | |
| parent | c8dbb84e8f5eb21ab6902dcfb0f633c43be28d3b (diff) | |
| download | ATCD-e8480565c7a9b486254ecc42283b56e1783a2985.tar.gz | |
ChangeLogTag:Fri Aug 03 22:15:51 2001 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 8 |
4 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 53cd6069def..92417f02695 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 03 22:15:51 2001 Steve Huston <shuston@riverace.com> + + * ace/Log_Msg.cpp (log): For 'W' and 'w' on HP-UX, the 'ls' and + 'lc' forms are not allowed; HP-UX requires 'S' and 'C'. + Fri Aug 3 13:10:59 2001 Ossama Othman <ossama@uci.edu> * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER, diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 53cd6069def..92417f02695 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Aug 03 22:15:51 2001 Steve Huston <shuston@riverace.com> + + * ace/Log_Msg.cpp (log): For 'W' and 'w' on HP-UX, the 'ls' and + 'lc' forms are not allowed; HP-UX requires 'S' and 'C'. + Fri Aug 3 13:10:59 2001 Ossama Othman <ossama@uci.edu> * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER, diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 53cd6069def..92417f02695 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Aug 03 22:15:51 2001 Steve Huston <shuston@riverace.com> + + * ace/Log_Msg.cpp (log): For 'W' and 'w' on HP-UX, the 'ls' and + 'lc' forms are not allowed; HP-UX requires 'S' and 'C'. + Fri Aug 3 13:10:59 2001 Ossama Othman <ossama@uci.edu> * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER, diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 0925d747954..a8ba4c18443 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -1312,7 +1312,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ ACE_OS::sprintf (bp, format, va_arg (argp, ACE_TCHAR *)); #elif defined (ACE_HAS_WCHAR) +# if defined (HPUX) + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); +# else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); +# endif /* HPUX */ ACE_OS::sprintf (bp, format, va_arg (argp, wchar_t *)); #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ break; @@ -1326,7 +1330,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ ACE_OS::sprintf (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) +# if defined (HPUX) + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); +# else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("lc")); +# endif /* HPUX */ ACE_OS::sprintf (bp, format, va_arg (argp, wint_t)); #else /* ACE_WIN32 */ ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); |