Update changes after fixing merge commit

Author: mcbarton

lib/CppInterOp/CXCppInterOp.cpp

@@ -200,9 +200,7 @@ CXTypeKind cxtype_GetTypeKind(QualType T) {
     TKCASE(Elaborated);
     TKCASE(Pipe);
     TKCASE(Attributed);
-#if CLANG_VERSION_MAJOR >= 16
     TKCASE(BTFTagAttributed);
-#endif
     TKCASE(Atomic);
   default:
     return CXType_Unexposed;

lib/CppInterOp/CppInterOp.cpp

@@ -181,7 +181,6 @@ std::string Demangle(const std::string& mangled_name) {
 #else
   std::string demangle =
       itaniumDemangle(mangled_name.c_str(), nullptr, nullptr, nullptr);
-#endif
 #endif
   return demangle;
 }
@@ -2981,12 +2980,7 @@ std::string DetectResourceDir(const char* ClangBinaryName /* = clang */) {
 
   std::string detected_resource_dir = outs.back();
 
-  std::string version =
-#if CLANG_VERSION_MAJOR < 16
-      CLANG_VERSION_STRING;
-#else
-      CLANG_VERSION_MAJOR_STRING;
-#endif
+  std::string version = CLANG_VERSION_MAJOR_STRING;
   // We need to check if the detected resource directory is compatible.
   if (llvm::sys::path::filename(detected_resource_dir) != version)
     return "";