josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Browse Source 
Tested in multiple configurations
.diff with TC changes added
This commit is contained in:
Nay
2012-09-17 23:21:01 +01:00
parent 6ebc6b9a76
commit 2e21fa6b92
549 changed files with 28949 additions and 14408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/acelite/ace/OS_NS_string.inl
+5 -5
View File
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
// $Id: OS_NS_string.inl 92069 2010-09-28 11:38:59Z johnnyw $
// $Id: OS_NS_string.inl 93549 2011-03-15 19:50:24Z olli $
// OS_NS_wchar.h is only needed to get the emulation methods.
// Perhaps they should be moved. dhinton
@@ -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)