Mercurial > hg > orthanc-databases
comparison Framework/PostgreSQL/PostgreSQLDatabase.cpp @ 59:318c1ccb787c
fix build with postgresql-11
author | s.jodogne@gmail.com |
---|---|
date | Sun, 28 Oct 2018 12:29:22 +0100 |
parents | 6a574d810b98 |
children | 714c5d2bee76 |
comparison
equal
deleted
inserted
replaced
58:0ff0ad51181d | 59:318c1ccb787c |
---|---|
24 #include "PostgreSQLResult.h" | 24 #include "PostgreSQLResult.h" |
25 #include "PostgreSQLStatement.h" | 25 #include "PostgreSQLStatement.h" |
26 #include "PostgreSQLTransaction.h" | 26 #include "PostgreSQLTransaction.h" |
27 #include "../Common/ImplicitTransaction.h" | 27 #include "../Common/ImplicitTransaction.h" |
28 | 28 |
29 #include <pg_config.h> | |
30 | |
31 #if PG_VERSION_NUM >= 110000 | |
32 # include <postgres.h> | |
33 # undef LOG // This one comes from <postgres.h>, and conflicts with <Core/Logging.h> | |
34 #endif | |
35 | |
29 #include <Core/Logging.h> | 36 #include <Core/Logging.h> |
30 #include <Core/OrthancException.h> | 37 #include <Core/OrthancException.h> |
31 | 38 |
32 #include <boost/lexical_cast.hpp> | 39 #include <boost/lexical_cast.hpp> |
33 | 40 |