# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1720021859 -7200
# Node ID d77292629430ef79d7c44108d2d7e0ec161d42f8
# Parent  71c7d260510de724edf5825e03407d5ed4449f3d# Parent  e4d9a872998f3ec93005e6a290baa53a4759b9d7
merge

diff -r 71c7d260510d -r d77292629430 OrthancFramework/Sources/Toolbox.cpp
--- 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 );
 
diff -r 71c7d260510d -r d77292629430 OrthancServer/Plugins/Engine/PluginsManager.cpp
--- 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"
diff -r 71c7d260510d -r d77292629430 OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h
--- 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")))
diff -r 71c7d260510d -r d77292629430 OrthancServer/Sources/main.cpp
--- 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))