Mercurial > hg > orthanc
changeset 5662:d77292629430
merge
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Wed, 03 Jul 2024 17:50:59 +0200 |
| parents | 71c7d260510d (current diff) e4d9a872998f (diff) |
| children | 3765085693e5 301212a3fa08 f690568f0325 |
| files | |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/Toolbox.cpp Wed Jul 03 17:50:43 2024 +0200 +++ b/OrthancFramework/Sources/Toolbox.cpp Wed Jul 03 17:50:59 2024 +0200 @@ -1885,7 +1885,7 @@ std::string Toolbox::GenerateUuid() { -#ifdef WIN32 +#ifdef _WIN32 UUID uuid; UuidCreate ( &uuid );
--- a/OrthancServer/Plugins/Engine/PluginsManager.cpp Wed Jul 03 17:50:43 2024 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsManager.cpp Wed Jul 03 17:50:59 2024 +0200 @@ -37,7 +37,7 @@ #include <memory> #include <boost/filesystem.hpp> -#ifdef WIN32 +#ifdef _WIN32 #define PLUGIN_EXTENSION ".dll" #elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(__OpenBSD__) #define PLUGIN_EXTENSION ".so"
--- a/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h Wed Jul 03 17:50:43 2024 +0200 +++ b/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h Wed Jul 03 17:50:59 2024 +0200 @@ -111,7 +111,7 @@ #include <stdio.h> #include <string.h> -#ifdef WIN32 +#ifdef _WIN32 # define ORTHANC_PLUGINS_API __declspec(dllexport) #elif __GNUC__ >= 4 # define ORTHANC_PLUGINS_API __attribute__ ((visibility ("default")))
--- a/OrthancServer/Sources/main.cpp Wed Jul 03 17:50:43 2024 +0200 +++ b/OrthancServer/Sources/main.cpp Wed Jul 03 17:50:59 2024 +0200 @@ -1187,7 +1187,7 @@ else { context.SetRestApiWriteToFileSystemEnabled(false); - LOG(WARNING) << "REST API cannot write to the file system bacause the \"RestApiWriteToFileSystemEnabled\" configuration is set to false. The URI /instances/../export is disabled. This is the most secure configuration."; + LOG(WARNING) << "REST API cannot write to the file system because the \"RestApiWriteToFileSystemEnabled\" configuration is set to false. The URI /instances/../export is disabled. This is the most secure configuration."; } if (lock.GetConfiguration().GetBooleanParameter("WebDavEnabled", true))