# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531116823 -7200
# Node ID d30d43c0f4f0c45bfcf1c5a658e72275b6fea68b
# Parent  a84b487ccbdc18cb5244419d2706438559514611# Parent  5a97c68a7a51da441ae94b6ab6681b2ea7aa8e80
merge

diff -r a84b487ccbdc -r d30d43c0f4f0 Framework/Common/Dictionary.h
--- a/Framework/Common/Dictionary.h	Mon Jul 09 08:13:20 2018 +0200
+++ b/Framework/Common/Dictionary.h	Mon Jul 09 08:13:43 2018 +0200
@@ -24,6 +24,7 @@
 #include "IValue.h"
 
 #include <map>
+#include <stdint.h>
 
 namespace OrthancDatabases
 {
diff -r a84b487ccbdc -r d30d43c0f4f0 Framework/Common/Integer64Value.h
--- a/Framework/Common/Integer64Value.h	Mon Jul 09 08:13:20 2018 +0200
+++ b/Framework/Common/Integer64Value.h	Mon Jul 09 08:13:43 2018 +0200
@@ -23,6 +23,8 @@
 
 #include "IValue.h"
 
+#include <stdint.h>
+
 namespace OrthancDatabases
 {
   class Integer64Value : public IValue
diff -r a84b487ccbdc -r d30d43c0f4f0 Framework/MySQL/MySQLDatabase.cpp
--- a/Framework/MySQL/MySQLDatabase.cpp	Mon Jul 09 08:13:20 2018 +0200
+++ b/Framework/MySQL/MySQLDatabase.cpp	Mon Jul 09 08:13:43 2018 +0200
@@ -30,7 +30,7 @@
 #include <Core/OrthancException.h>
 #include <Core/Toolbox.h>
 
-#include <mysql/errmsg.h>
+#include <errmsg.h>
 #include <mysqld_error.h>
 
 #include <memory>
diff -r a84b487ccbdc -r d30d43c0f4f0 Framework/MySQL/MySQLResult.cpp
--- a/Framework/MySQL/MySQLResult.cpp	Mon Jul 09 08:13:20 2018 +0200
+++ b/Framework/MySQL/MySQLResult.cpp	Mon Jul 09 08:13:43 2018 +0200
@@ -24,7 +24,7 @@
 #include <Core/Logging.h>
 #include <Core/OrthancException.h>
 
-#include <mysql/errmsg.h>
+#include <errmsg.h>
 #include <mysqld_error.h>
 
 namespace OrthancDatabases
diff -r a84b487ccbdc -r d30d43c0f4f0 PostgreSQL/UnitTests/PostgreSQLTests.cpp
--- a/PostgreSQL/UnitTests/PostgreSQLTests.cpp	Mon Jul 09 08:13:20 2018 +0200
+++ b/PostgreSQL/UnitTests/PostgreSQLTests.cpp	Mon Jul 09 08:13:43 2018 +0200
@@ -44,7 +44,7 @@
 
 using namespace OrthancDatabases;
 
-extern const OrthancDatabases::PostgreSQLParameters  globalParameters_;
+extern OrthancDatabases::PostgreSQLParameters  globalParameters_;
 
 
 static OrthancDatabases::PostgreSQLDatabase* CreateTestDatabase(bool clearAll)
diff -r a84b487ccbdc -r d30d43c0f4f0 Resources/CMake/PostgreSQLConfiguration.cmake
--- a/Resources/CMake/PostgreSQLConfiguration.cmake	Mon Jul 09 08:13:20 2018 +0200
+++ b/Resources/CMake/PostgreSQLConfiguration.cmake	Mon Jul 09 08:13:43 2018 +0200
@@ -306,6 +306,8 @@
       )      
 
   elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    link_libraries(secur32)
+    
     include_directories(
       ${LIBPQ_SOURCES_DIR}/src/include/port/win32
       ${LIBPQ_SOURCES_DIR}/src/port