Mercurial > hg > orthanc-databases

diff Framework/PostgreSQL/PostgreSQLDatabase.cpp @ 59:318c1ccb787c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build with postgresql-11
author s.jodogne@gmail.com
date Sun, 28 Oct 2018 12:29:22 +0100
parents 6a574d810b98
children 714c5d2bee76
line wrap: on
line diff
--- 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 <pg_config.h>
+
+#if PG_VERSION_NUM >= 110000
+#  include <postgres.h>
+#  undef LOG  // This one comes from <postgres.h>, and conflicts with <Core/Logging.h>
+#endif
+
 #include <Core/Logging.h>
 #include <Core/OrthancException.h>