[PATCH] D131925: Undef FS and CS macros for Android x86_64

[Chih-Hung Hsieh via Phabricator via llvm-commits]

chh updated this revision to Diff 452850.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D131925/new/

https://reviews.llvm.org/D131925

Files:
  llvm/include/llvm/ADT/SmallVector.h
  llvm/include/llvm/Support/VirtualFileSystem.h


Index: llvm/include/llvm/Support/VirtualFileSystem.h
===================================================================
--- llvm/include/llvm/Support/VirtualFileSystem.h
+++ llvm/include/llvm/Support/VirtualFileSystem.h
@@ -36,6 +36,9 @@
 #include <utility>
 #include <vector>
 
+// ANDROID x86_64 defined the FS macro
+#undef FS
+
 namespace llvm {
 
 class MemoryBuffer;
Index: llvm/include/llvm/ADT/SmallVector.h
===================================================================
--- llvm/include/llvm/ADT/SmallVector.h
+++ llvm/include/llvm/ADT/SmallVector.h
@@ -30,6 +30,9 @@
 #include <type_traits>
 #include <utility>
 
+// ANDROID x86_64 defined the CS macro
+#undef CS
+
 namespace llvm {
 
 template <typename T> class ArrayRef;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D131925.452850.patch
Type: text/x-patch
Size: 741 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220815/9c2bea97/attachment.bin>