Author: Vlad Serebrennikov Date: 2024-04-14T17:51:15+04:00 New Revision: 7cfe73624780010ec81ca11c41ebbf214400abdd
URL: https://github.com/llvm/llvm-project/commit/7cfe73624780010ec81ca11c41ebbf214400abdd DIFF: https://github.com/llvm/llvm-project/commit/7cfe73624780010ec81ca11c41ebbf214400abdd.diff LOG: [clang] Fix name conflict with `sys/mac.h` on AIX (#88644) Fixes clang-ppc64-aix bot failure after #88559 (0a6f6df5b0c3d0f2a42f013bf5cafb9b5020dcac) https://lab.llvm.org/buildbot/#/builders/214/builds/11887 --------- Co-authored-by: Joseph Huber <hube...@outlook.com> Added: Modified: clang/include/clang/Basic/Cuda.h Removed: ################################################################################ diff --git a/clang/include/clang/Basic/Cuda.h b/clang/include/clang/Basic/Cuda.h index acc6bb6581d857..38f30543a0f662 100644 --- a/clang/include/clang/Basic/Cuda.h +++ b/clang/include/clang/Basic/Cuda.h @@ -50,6 +50,10 @@ const char *CudaVersionToString(CudaVersion V); // Input is "Major.Minor" CudaVersion CudaStringToVersion(const llvm::Twine &S); +// We have a name conflict with sys/mac.h on AIX +#ifdef SM_32 +#undef SM_32 +#endif enum class CudaArch { UNUSED, UNKNOWN, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
