Merge upstream LLVM r356524.

Bug: chromium:944675 Change-Id: Icfe9d147fc6be936aac5a45f3bb6526022e5e898 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27848 Presubmit-Ready: Nico Weber <thakis@chromium.org> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nico Weber <thakis@chromium.org>

Merge upstream LLVM r356524.
cf186618 · Nico Weber · 3dbb7757 · cf186618
Commit cf186618 authored Mar 22, 2019 by Nico Weber
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Target.h third_party/llvm-7.0/llvm/include/llvm-c/Target.h +0 -4

No files found.
--- a/third_party/llvm-7.0/llvm/include/llvm-c/Target.h
+++ b/third_party/llvm-7.0/llvm/include/llvm-c/Target.h
@@ -22,10 +22,6 @@
 #include "llvm-c/Types.h"
 #include "llvm/Config/llvm-config.h"

-#if defined(_MSC_VER) && !defined(inline)
-#define inline __inline
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif