diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2022-10-11 15:52:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 15:52:48 -0500 |
| commit | f63ede24b58993e439c94cf8a3b01773debfba17 (patch) | |
| tree | 30e0d1568d39ca73295d80edf9bce65426adba83 /ACE/ace/ace_wchar.h | |
| parent | 1bff842cc585cbad02f265371674f83016b174dd (diff) | |
| parent | bdde15c15c34f8b4fb04823d2c1ca43a66a5d59d (diff) | |
| download | ATCD-f63ede24b58993e439c94cf8a3b01773debfba17.tar.gz | |
Merge pull request #1948 from mitza-oci/a6t2-merge
[ACE6-TAO2] Merge selected recent changes from ACE7-TAO3
Diffstat (limited to 'ACE/ace/ace_wchar.h')
| -rw-r--r-- | ACE/ace/ace_wchar.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index 7afc673328b..37197c1c968 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -94,6 +94,11 @@ typedef char ACE_ANTI_TCHAR; # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () +# if !defined (ACE_WIN32) +# define ACE_TEXT_PRIs ACE_TEXT("ls") +# else +# define ACE_TEXT_PRIs ACE_TEXT("s") +# endif #else /* ACE_USES_WCHAR */ typedef char ACE_TCHAR; typedef wchar_t ACE_ANTI_TCHAR; @@ -103,6 +108,7 @@ typedef wchar_t ACE_ANTI_TCHAR; # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () +# define ACE_TEXT_PRIs ACE_TEXT("s") #endif /* ACE_USES_WCHAR */ // The OS_String module defines some wide-char functions that are not |