commit 90a0449257e5b389d3d95a9bd7f1a2468ad60d7e
author Louis Dionne <ldionne.2@gmail.com> Tue Feb 02 16:58:38 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Thu Feb 04 07:21:00 2021 -0800
tree 0882bd0255845627fd911be3506fd0a52bb73a1e
parent 1bb0f67921bf8b9e0ed1d285692c0637bfcc3f1a

[libc++] Rename include/support to include/__support

We do ship those headers, so the directory name should not be something
that can potentially conflict with user-defined directories.

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

GitOrigin-RevId: b51756819a85563ae063e98eeb3d6af8e44c8f64

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 224299b..76227d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,7 @@
 if (LIBCXX_CONFIGURE_IDE)
   file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*)
   if(WIN32)
-    file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h)
+    file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/__support/win32/*.h)
     list(APPEND LIBCXX_HEADERS ${LIBCXX_WIN32_HEADERS})
   endif()
   # Force them all into the headers dir on MSVC, otherwise they end up at

src/locale.cpp

diff --git a/src/locale.cpp b/src/locale.cpp
index f109389..a0209d0 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -29,7 +29,7 @@
 #include "cwctype"
 #include "__sso_allocator"
 #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include "support/win32/locale_win32.h"
+#include "__support/win32/locale_win32.h"
 #elif !defined(__BIONIC__) && !defined(__NuttX__)
 #include <langinfo.h>
 #endif

src/support/solaris/xlocale.cpp

diff --git a/src/support/solaris/xlocale.cpp b/src/support/solaris/xlocale.cpp
index d68a39f..d25adcd 100644
--- a/src/support/solaris/xlocale.cpp
+++ b/src/support/solaris/xlocale.cpp
@@ -8,7 +8,7 @@
 
 #ifdef __sun__
 
-#include "support/solaris/xlocale.h"
+#include "__support/solaris/xlocale.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/localedef.h>

src/support/win32/locale_win32.cpp

diff --git a/src/support/win32/locale_win32.cpp b/src/support/win32/locale_win32.cpp
index b7062db..e7c6005 100644
--- a/src/support/win32/locale_win32.cpp
+++ b/src/support/win32/locale_win32.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------- support/win32/locale_win32.cpp ------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

src/support/win32/support.cpp

diff --git a/src/support/win32/support.cpp b/src/support/win32/support.cpp
index d156e02..52453f5 100644
--- a/src/support/win32/support.cpp
+++ b/src/support/win32/support.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===----------------------- support/win32/support.h ----------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

src/support/win32/thread_win32.cpp

diff --git a/src/support/win32/thread_win32.cpp b/src/support/win32/thread_win32.cpp
index 83e7e9f..35c4c87 100644
--- a/src/support/win32/thread_win32.cpp
+++ b/src/support/win32/thread_win32.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------- support/win32/thread_win32.cpp ------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.