Skip to content
Snippets Groups Projects
Commit 0ef70bba authored by Thomas Munro's avatar Thomas Munro
Browse files

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
parent 0e8f927f
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,9 @@ extern "C" ...@@ -42,6 +42,9 @@ extern "C"
#include <llvm-c/Core.h> #include <llvm-c/Core.h>
#include <llvm-c/BitReader.h> #include <llvm-c/BitReader.h>
/* Avoid macro clash with LLVM's C++ headers */
#undef Min
#include <llvm/ADT/SetVector.h> #include <llvm/ADT/SetVector.h>
#include <llvm/ADT/StringSet.h> #include <llvm/ADT/StringSet.h>
#include <llvm/ADT/StringMap.h> #include <llvm/ADT/StringMap.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment