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.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index 1bcdee2c6a5..0848570ab34 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -19,7 +19,7 @@
# include /**/ "ace/pre.h"
-# include "ace/config-lite.h"
+# include "ace/config-all.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -183,7 +183,7 @@ namespace ACE_OS {
#endif /* ACE_HAS_WCHAR */
/// Returns a system error message.
- extern ACE_Export
+ ACE_NAMESPACE_INLINE_FUNCTION
char *strerror (int errnum);
#if defined (ACE_LACKS_STRERROR)
@@ -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) && defined(ACE_LACKS_WCSTOK)
+# if defined (ACE_HAS_WCHAR)
/// 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 && ACE_LACKS_WCSTOK
+# endif // ACE_HAS_WCHAR
+#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
} /* namespace ACE_OS */