diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2019-07-29 10:12:37 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2019-07-29 10:24:20 +1200 |
| commit | 180825fe43ece9bf13c27929b7fdeec5a457e9c3 (patch) | |
| tree | d6df8f4ca36fe55526e1213613000890faadd55a /src/backend/jit/llvm/llvmjit_inline.cpp | |
| parent | e396d1ee7db5027302bc8ce129b435dee13723a4 (diff) | |
| download | postgresql-180825fe43ece9bf13c27929b7fdeec5a457e9c3.tar.gz postgresql-180825fe43ece9bf13c27929b7fdeec5a457e9c3.zip | |
Avoid macro clash with LLVM 9.
Early previews of LLVM 9 reveal that our Min() macro causes compiler
errors in LLVM headers reached by the #include directives in
llvmjit_inline.cpp. Let's just undefine it. Per buildfarm animal
seawasp. Back-patch to 11.
Reviewed-by: Fabien Coelho, Tom Lane
Discussion: https://postgr.es/m/20190606173216.GA6306%40alvherre.pgsql
Diffstat (limited to 'src/backend/jit/llvm/llvmjit_inline.cpp')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_inline.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp index 8005d43a849..0513998b021 100644 --- a/src/backend/jit/llvm/llvmjit_inline.cpp +++ b/src/backend/jit/llvm/llvmjit_inline.cpp @@ -42,6 +42,9 @@ extern "C" #include <llvm-c/Core.h> #include <llvm-c/BitReader.h> +/* Avoid macro clash with LLVM's C++ headers */ +#undef Min + #include <llvm/ADT/SetVector.h> #include <llvm/ADT/StringSet.h> #include <llvm/ADT/StringMap.h> |