mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid macro clash with LLVM 9.

Browse Source 
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
This commit is contained in:
Thomas Munro 2019-07-29 10:12:37 +12:00
parent b10f40bf0e
commit a2a777d011
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/jit/llvm/llvmjit_inline.cpp
View File

@ -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>