summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_string.h
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-15 19:50:24 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-15 19:50:24 +0000
commitc7b0ec93d4c473a16da75234678f676dc8f5d4bd (patch)
tree5025f092914b55cdd883d0b2d70c83e8648c636e /ACE/ace/OS_NS_string.h
parentca7601bc5aa49ac8e03369049f5c813b3f6d02e5 (diff)
downloadATCD-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.h')
-rw-r--r--ACE/ace/OS_NS_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h
index 35ad7f46d1b..06520a276de 100644
--- a/ACE/ace/OS_NS_string.h
+++ b/ACE/ace/OS_NS_string.h
@@ -449,11 +449,11 @@ namespace ACE_OS {
wchar_t *strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts);
#endif // ACE_HAS_WCHAR
-#if !defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_LACKS_STRTOK_R)
+#if defined (ACE_LACKS_STRTOK_R)
/// Emulated strtok_r.
extern ACE_Export
char *strtok_r_emulation (char *s, const char *tokens, char **lasts);
-#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
+#endif /* ACE_LACKS_STRTOK_R */
# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK)
/// Emulated strtok_r (wchar_t version).