Move uncaught_exeption() definition inside the #ifdef block like uncaught_exceptions()

llvm-svn: 238879

1 files changed, 23 insertions, 4 deletions

diff --git a/libcxx/include/cstring b/libcxx/include/cstring
index 21c9155cd4d..d3659b36179 100644
--- a/libcxx/include/cstring
+++ b/libcxx/include/cstring
@@ -67,15 +67,34 @@ size_t strlen(const char* s);
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 using ::size_t;
-using ::memcpy;
-using ::memmove;
+
+// 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 ::strcpy;
 using ::strncpy;
 using ::strcat;
 using ::strncat;
-using ::memcmp;
+
+// 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 ::strcmp;
-using ::strncmp;
+
+// 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 ::strcoll;
 using ::strxfrm;