postgrespro.git / summary / log / commit / refs

commit    a2a777d011971ace3a349a3f02b1bf6eeea07bf2
Author:   Thomas Munro <tmunro@postgresql.org>
Date:     Sun Jul 28 22:12:37 2019 +0000

    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


 src/backend/jit/llvm/llvmjit_inline.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
index 8005d43a84..0513998b02 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>


[parent: b10f40bf0e45]