diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-15 22:24:17 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-15 22:24:17 +0000 |
| commit | a7b1136d99cf19120287bfda4383f2fb9c77869d (patch) | |
| tree | 14044bff06077715118baf22c8a2f809425d835a | |
| parent | d20499ea973041a4d41c978f15f38a7b491207f3 (diff) | |
| download | ATCD-a7b1136d99cf19120287bfda4383f2fb9c77869d.tar.gz | |
ChangeLogTag: Wed Sep 15 15:17:39 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | ace/OS_NS_string.h | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 31c540aeed0..79a5e787746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,21 @@ +Wed Sep 15 15:17:39 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/OS_NS_string.h: + + Changed preprocessor conditional for the declaration of the wide + character version of strtok_r_emulation() to use ACE_WCHAR and + ACE_LACKS_WCSTOK instead of ACE_HAS_REENTRANT_FUNCTIONS. + Wed Sep 15 11:41:53 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu> - * ace/ACE.cpp (set_handle_limit): Removed the - + * ace/ACE.cpp (set_handle_limit): Removed the + ACE_NOTREACHED (return 0); - + and replaced it with - + return 0; - + Thanks to Martin Corino <mcorino@remedy.nl> for reporting this. Wed Sep 15 10:46:07 2004 Dale Wilson <wilson_d@ociweb.com> diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h index a1bca281806..1bcdee2c6a5 100644 --- a/ace/OS_NS_string.h +++ b/ace/OS_NS_string.h @@ -456,13 +456,13 @@ namespace ACE_OS { /// Emulated strtok_r. extern ACE_Export char *strtok_r_emulation (char *s, const char *tokens, char **lasts); +#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ -# if defined (ACE_HAS_WCHAR) +# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK) /// Emulated strtok_r (wchar_t version). extern ACE_Export wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts); -# endif // ACE_HAS_WCHAR -#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ +# endif // ACE_HAS_WCHAR && ACE_LACKS_WCSTOK } /* namespace ACE_OS */ |