mstorsjo added inline comments. ================ Comment at: lib/Headers/armintr.h:26 @@ +25,3 @@ +#ifndef _MSC_VER +#include_next <armintr.h> +#else ---------------- compnerd wrote: > Hmm, why not do __has_header instead? armv7-windows-itanium won't define > `_MSC_VER` but you may have the header from the SDK. Hmm, so you mean like this?
``` #if __has_include_next(<armintr.h>) #include_next <armintr.h> #else // Normal file content typedef enum ... ``` That would cause use in armv7-windows-msvc mode to use the SDK's armintr.h instead of ours - which as far as I know also is fine. (The issue I'm mainly fixing is that including `<intrin.h>` is expected to bring in this, but currently it doesn't.) I'm not sure I follow your argument completely though - armv7-windows-itanium doesn't define `_MSC_VER`, and thus would already try to include the next armintr.h, which would be picked up from the SDK if it exists there. https://reviews.llvm.org/D22774 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits