summaryrefslogtreecommitdiff
path: root/ace/OS_NS_string.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/OS_NS_string.h')
-rw-r--r--ace/OS_NS_string.h6
1 files changed, 3 insertions, 3 deletions
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 */