diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-04 12:14:38 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-04 12:14:38 +0000 |
| commit | 45d4b9a582543983a625deb6cd012522762112f9 (patch) | |
| tree | 52e3c940d7052b1064f592af6c6ad2a9d11c10d4 | |
| parent | 1328ee8ae8a34175ffd80c2579b3a6f6c52610f8 (diff) | |
| download | ATCD-45d4b9a582543983a625deb6cd012522762112f9.tar.gz | |
ChangeLogTag:Fri May 4 06:28:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/ace_wchar.h | 11 |
4 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 03a4f040ec6..46b21d51a9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Fri May 4 06:28:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/ace_wchar.h: Add a new macro (ACE_USES_L_PREFIX) that allows + users to control whether wide character strings use the "L" + prefix via their config.h files. Thanks to Albert Wijnja for + this fix. + * examples/Misc/test_read_buffer.cpp (main): Changed <int> to <ACE_HANDLE> so this will work properly on Win32 platforms. Thanks to Johnny Willemsen for reporting the problem. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 03a4f040ec6..46b21d51a9c 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,5 +1,10 @@ Fri May 4 06:28:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/ace_wchar.h: Add a new macro (ACE_USES_L_PREFIX) that allows + users to control whether wide character strings use the "L" + prefix via their config.h files. Thanks to Albert Wijnja for + this fix. + * examples/Misc/test_read_buffer.cpp (main): Changed <int> to <ACE_HANDLE> so this will work properly on Win32 platforms. Thanks to Johnny Willemsen for reporting the problem. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 03a4f040ec6..46b21d51a9c 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,5 +1,10 @@ Fri May 4 06:28:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/ace_wchar.h: Add a new macro (ACE_USES_L_PREFIX) that allows + users to control whether wide character strings use the "L" + prefix via their config.h files. Thanks to Albert Wijnja for + this fix. + * examples/Misc/test_read_buffer.cpp (main): Changed <int> to <ACE_HANDLE> so this will work properly on Win32 platforms. Thanks to Johnny Willemsen for reporting the problem. diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index ee4cb770be6..a692f06bb05 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -82,10 +82,19 @@ using std::size_t; # endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ #endif /* ACE_HAS_WCHAR && !_MSC_VER */ +// Set the default behaviour for ACE_TEXT_WIDE to use the L-prefix +#if !defined (ACE_USES_L_PREFIX) +# define ACE_USES_L_PREFIX 1 +#endif /* ACE_USES_L_PREFIX */ + // Define the unicode/wchar related macros correctly # if !defined (ACE_TEXT_WIDE) -# define ACE_TEXT_WIDE_I(STRING) L##STRING +# if (ACE_USES_L_PREFIX == 1) +# define ACE_TEXT_WIDE_I(STRING) L##STRING +# else /* ACE_USES_L_PREFIX */ +# define ACE_TEXT_WIDE_I(STRING) STRING +# endif /* ACE_USES_L_PREFIX */ # define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING) # endif /* ACE_TEXT_WIDE */ |