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