[libcxx-commits] [libcxx] acd7be7 - [libc++] Fix a few warnings

[Louis Dionne via libcxx-commits]

Author: YAMAMOTO Takashi
Date: 2020-10-28T15:41:10-04:00
New Revision: acd7be74ca12f8f08e52d6d80850a9b230109134

URL: https://github.com/llvm/llvm-project/commit/acd7be74ca12f8f08e52d6d80850a9b230109134
DIFF: https://github.com/llvm/llvm-project/commit/acd7be74ca12f8f08e52d6d80850a9b230109134.diff

LOG: [libc++] Fix a few warnings

Found during a NuttX porting effort.
But these changes are not directly relevant to NuttX.

Differential Revision: https://reviews.llvm.org/D90139

Added: 
    

Modified: 
    libcxx/src/filesystem/operations.cpp
    libcxx/src/locale.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/src/filesystem/operations.cpp b/libcxx/src/filesystem/operations.cpp
index 95d7d0d96426..788e31b673aa 100644
--- a/libcxx/src/filesystem/operations.cpp
+++ b/libcxx/src/filesystem/operations.cpp
@@ -534,7 +534,7 @@ path __canonical(path const& orig_p, error_code* ec) {
   ErrorHandler<path> err("canonical", ec, &orig_p, &cwd);
 
   path p = __do_absolute(orig_p, &cwd, ec);
-#if _POSIX_VERSION >= 200112
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112
   std::unique_ptr<char, decltype(&::free)>
     hold(::realpath(p.c_str(), nullptr), &::free);
   if (hold.get() == nullptr)

diff  --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index b9180880e494..02dbb334ff88 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -1149,7 +1149,7 @@ ctype<char>::__classic_upper_table() _NOEXCEPT
 {
     return _LIBCPP_GET_C_LOCALE->__ctype_toupper;
 }
-#elif __NetBSD__
+#elif defined(__NetBSD__)
 const short*
 ctype<char>::__classic_lower_table() _NOEXCEPT
 {