From b957bac1daaf11059842d87d5facbc3ece2d8721 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 2 Jun 2015 22:26:29 +0000
Subject: [PATCH] Revert changes inadvertantly committed

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238880 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/cstring | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/include/cstring b/include/cstring
index d3659b361..21c9155cd 100644
--- a/include/cstring
+++ b/include/cstring
@@ -67,34 +67,15 @@ size_t strlen(const char* s);
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 using ::size_t;
-
-// using ::memcpy;
-inline _LIBCPP_INLINE_VISIBILITY 
-void* memcpy(void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
-{ return ::memcpy(__s1, __s2, __n); }
-
-// using ::memmove;
-inline _LIBCPP_INLINE_VISIBILITY 
-void* memmove(void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
-{ return ::memmove(__s1, __s2, __n); }
-
+using ::memcpy;
+using ::memmove;
 using ::strcpy;
 using ::strncpy;
 using ::strcat;
 using ::strncat;
-
-// using ::memcmp;
-inline _LIBCPP_INLINE_VISIBILITY 
-int memcmp(const void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
-{ return ::memcmp(__s1, __s2, __n); }
-
+using ::memcmp;
 using ::strcmp;
-
-// using ::strncmp;
-inline _LIBCPP_INLINE_VISIBILITY 
-int strncmp(const char* __s1, const char* __s2, size_t __n) __attribute__((nonnull(1, 2)))
-{ return ::memcmp(__s1, __s2, __n); }
-
+using ::strncmp;
 using ::strcoll;
 using ::strxfrm;