comparison Framework/PostgreSQL/PostgreSQLResult.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
25 #include "../Common/FileValue.h" 25 #include "../Common/FileValue.h"
26 #include "../Common/Integer64Value.h" 26 #include "../Common/Integer64Value.h"
27 #include "../Common/NullValue.h" 27 #include "../Common/NullValue.h"
28 #include "../Common/Utf8StringValue.h" 28 #include "../Common/Utf8StringValue.h"
29 29
30 #include <pg_config.h>
31
32 #if PG_VERSION_NUM >= 110000
33 # include <postgres.h>
34 # undef LOG // This one comes from <postgres.h>, and conflicts with <Core/Logging.h>
35 #endif
36
30 #include <Core/OrthancException.h> 37 #include <Core/OrthancException.h>
31 #include <Core/Logging.h> 38 #include <Core/Logging.h>
32 39
33 #include <cassert> 40 #include <cassert>
34 #include <boost/lexical_cast.hpp> 41 #include <boost/lexical_cast.hpp>