# HG changeset patch # User s.jodogne@gmail.com # Date 1540726162 -3600 # Node ID 318c1ccb787c01dc582f62b28a889022d04afd70 # Parent 0ff0ad51181dba517267faee47daceb36a7eb1ee fix build with postgresql-11 diff -r 0ff0ad51181d -r 318c1ccb787c Framework/PostgreSQL/PostgreSQLDatabase.cpp --- a/Framework/PostgreSQL/PostgreSQLDatabase.cpp Sun Oct 28 12:07:51 2018 +0100 +++ b/Framework/PostgreSQL/PostgreSQLDatabase.cpp Sun Oct 28 12:29:22 2018 +0100 @@ -26,6 +26,13 @@ #include "PostgreSQLTransaction.h" #include "../Common/ImplicitTransaction.h" +#include + +#if PG_VERSION_NUM >= 110000 +# include +# undef LOG // This one comes from , and conflicts with +#endif + #include #include diff -r 0ff0ad51181d -r 318c1ccb787c Framework/PostgreSQL/PostgreSQLResult.cpp --- a/Framework/PostgreSQL/PostgreSQLResult.cpp Sun Oct 28 12:07:51 2018 +0100 +++ b/Framework/PostgreSQL/PostgreSQLResult.cpp Sun Oct 28 12:29:22 2018 +0100 @@ -27,6 +27,13 @@ #include "../Common/NullValue.h" #include "../Common/Utf8StringValue.h" +#include + +#if PG_VERSION_NUM >= 110000 +# include +# undef LOG // This one comes from , and conflicts with +#endif + #include #include diff -r 0ff0ad51181d -r 318c1ccb787c Framework/PostgreSQL/PostgreSQLStatement.cpp --- a/Framework/PostgreSQL/PostgreSQLStatement.cpp Sun Oct 28 12:07:51 2018 +0100 +++ b/Framework/PostgreSQL/PostgreSQLStatement.cpp Sun Oct 28 12:29:22 2018 +0100 @@ -29,6 +29,13 @@ #include "../Common/Utf8StringValue.h" #include "PostgreSQLResult.h" +#include + +#if PG_VERSION_NUM >= 110000 +# include +# undef LOG // This one comes from , and conflicts with +#endif + #include #include #include