| commit | cf1866183620c139c81032a86daec09447a03bd9 | [log] [tgz] |
|---|---|---|
| author | Nico Weber <thakis@chromium.org> | Fri Mar 22 08:16:16 2019 -0400 |
| committer | Nico Weber <thakis@chromium.org> | Fri Mar 22 13:18:19 2019 +0000 |
| tree | bd01e12cdacb37af190690744dc2ecb375a1ae28 | |
| parent | 3dbb77576f93663e9f301a4f51ee083e051d04b3 [diff] |
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>
diff --git a/third_party/llvm-7.0/llvm/include/llvm-c/Target.h b/third_party/llvm-7.0/llvm/include/llvm-c/Target.h index 03004ba..7060ba2 100644 --- 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