Mercurial > hg > orthanc-databases

changeset 8:d30d43c0f4f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Jul 2018 08:13:43 +0200
parents a84b487ccbdc (current diff) 5a97c68a7a51 (diff)
children eff482803d30
files
diffstat 6 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 {
--- 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
--- 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>
--- 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
--- 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)
--- 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