summaryrefslogtreecommitdiff
path: root/ace/OS_String.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/OS_String.cpp')
-rw-r--r--ace/OS_String.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
index 934f32d37b9..f2658eb7fe9 100644
--- a/ace/OS_String.cpp
+++ b/ace/OS_String.cpp
@@ -424,8 +424,9 @@ ACE_OS_String::strtok_r_emulation (char *s, const char *tokens, char **lasts)
*lasts += 1;
return s ;
}
+#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
-# if defined (ACE_HAS_WCHAR)
+#if defined (ACE_HAS_WCHAR)
wchar_t*
ACE_OS_String::strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts)
{
@@ -445,8 +446,7 @@ ACE_OS_String::strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, AC
*lasts += 1;
return s ;
}
-# endif // ACE_HAS_WCHAR
-#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
+#endif // ACE_HAS_WCHAR
#if !defined (ACE_HAS_MEMCHR)
const void *