diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-03-15 19:50:24 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-03-15 19:50:24 +0000 |
| commit | c7b0ec93d4c473a16da75234678f676dc8f5d4bd (patch) | |
| tree | 5025f092914b55cdd883d0b2d70c83e8648c636e /ACE/ace/OS_NS_string.inl | |
| parent | ca7601bc5aa49ac8e03369049f5c813b3f6d02e5 (diff) | |
| download | ATCD-c7b0ec93d4c473a16da75234678f676dc8f5d4bd.tar.gz | |
ChangeLogTag: Tue Mar 15 19:47:01 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/OS_NS_string.inl')
| -rw-r--r-- | ACE/ace/OS_NS_string.inl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index f909b92a0b0..734e90e1aa2 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -526,11 +526,11 @@ ACE_OS::strtok_r (char *s, const char *tokens, char **lasts) { #if defined (ACE_HAS_TR24731_2005_CRT) return strtok_s (s, tokens, lasts); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (ACE_LACKS_STRTOK_R) - return ::strtok_r (s, tokens, lasts); -#else +#elif defined (ACE_LACKS_STRTOK_R) return ACE_OS::strtok_r_emulation (s, tokens, lasts); -#endif /* (ACE_HAS_REENTRANT_FUNCTIONS) */ +#else + return ::strtok_r (s, tokens, lasts); +#endif /* ACE_HAS_TR24731_2005_CRT */ } #if defined (ACE_HAS_WCHAR) |