[cxx-interop] Rename cxx-interop.h -> swift-interop-support.h.

Author: zoecarver

lib/ClangImporter/CMakeLists.txt

@@ -43,20 +43,20 @@ add_dependencies(swiftClangImporter
 
 set_swift_llvm_is_available(swiftClangImporter)
 
-# Mark - copy "cxx-interop.h" into the local include directory and install it
+# Mark - copy "swift-interop-support.h" into the local include directory and install it
 # into the compiler toolchain.
 set(SWIFTINC_DIR
     "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/include/swift")
 
 add_custom_command(
-    OUTPUT "${SWIFTINC_DIR}/cxx-interop.h"
-    COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/cxx-interop.h" "${SWIFTINC_DIR}")
+    OUTPUT "${SWIFTINC_DIR}/swift-interop-support.h"
+    COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/swift-interop-support.h" "${SWIFTINC_DIR}")
 
 add_custom_target("copy_cxxInterop_support_header"
-    DEPENDS "${SWIFTINC_DIR}/cxx-interop.h"
+    DEPENDS "${SWIFTINC_DIR}/swift-interop-support.h"
     COMMENT "Copying C++ interop support header to ${SWIFTINC_DIR}")
 
-swift_install_in_component(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cxx-interop.h"
+swift_install_in_component(FILES "${CMAKE_CURRENT_SOURCE_DIR}/swift-interop-support.h"
                            DESTINATION "include/swift"
                            COMPONENT compiler)
 

lib/ClangImporter/cxx-interop.h renamed to lib/ClangImporter/swift-interop-support.h

@@ -1,4 +1,4 @@
-//===--- cxx-interop.h - C++ and Swift Interop ------------------*- C++ -*-===//
+//===--- swift-interop-support.h - C++ and Swift Interop --------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -14,8 +14,8 @@
 // codebases that interoperate with Swift.
 //
 //===----------------------------------------------------------------------===//
-#ifndef SWIFT_CLANGIMPORTER_CXX_INTEROP_H
-#define SWIFT_CLANGIMPORTER_CXX_INTEROP_H
+#ifndef SWIFT_CLANGIMPORTER_SWIFT_INTEROP_SUPPORT_H
+#define SWIFT_CLANGIMPORTER_SWIFT_INTEROP_SUPPORT_H
 
 #define SELF_CONTAINED __attribute__((swift_attr("import_owned")))
 #define SAFE_TO_IMPORT __attribute__((swift_attr("import_unsafe")))
@@ -28,4 +28,4 @@
 
 #define SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
 
-#endif // SWIFT_CLANGIMPORTER_CXX_INTEROP_H
+#endif // SWIFT_CLANGIMPORTER_SWIFT_INTEROP_SUPPORT_H