summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_string.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-08-13 19:49:52 +0200
committerGitHub <noreply@github.com>2020-08-13 19:49:52 +0200
commitdbc170b91a66b53d043e1d7e5083589318363d6f (patch)
tree5e368278cab225c3a70ca1a11f51ece28b018d86 /ACE/ace/OS_NS_string.inl
parent96c0dfcd30206846490324b82c98dc4dd8b4d6e9 (diff)
parent6429c617c67bff73690581df27e9ec360e460deb (diff)
downloadATCD-dbc170b91a66b53d043e1d7e5083589318363d6f.tar.gz
Merge pull request #1189 from jwillemsen/jwi-removememchremulation
Removed memchr emulation, not used anymore by any platform config file
Diffstat (limited to 'ACE/ace/OS_NS_string.inl')
-rw-r--r--ACE/ace/OS_NS_string.inl4
1 files changed, 0 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index fd90ac54998..dc43adc50e6 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -9,11 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const void *
ACE_OS::memchr (const void *s, int c, size_t len)
{
-#if !defined (ACE_LACKS_MEMCHR)
return ::memchr (s, c, len);
-#else /* ACE_LACKS_MEMCHR */
- return ACE_OS::memchr_emulation (s, c, len);
-#endif /* !ACE_LACKS_MEMCHR */
}
ACE_INLINE void *