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

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

chh created this revision.
chh added a reviewer: srhines.
Herald added subscribers: danielkiss, pengfei.
Herald added a project: All.
chh requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Android bionic x86_64 .h file defines the FS and CS macros.
Some lldb files have included the bionic .h files
before these files where FS and CS are used
as parameters or variables.


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.452826.patch
Type: text/x-patch
Size: 741 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220815/164bf754/attachment.bin>