Mercurial > hg > orthanc

changeset 2136:dd609a99d39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformization of the macro naming
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:08:05 +0100
parents cadfe0a2a393
children 595cf22b3e7e
files CMakeLists.txt Core/HttpClient.cpp Core/HttpServer/MongooseServer.cpp Core/Pkcs11.cpp Core/Pkcs11.h Core/PrecompiledHeaders.h Core/RestApi/RestApi.cpp Core/RestApi/RestApiOutput.cpp Core/Toolbox.cpp Core/Toolbox.h OrthancServer/Internals/DicomImageDecoder.cpp OrthancServer/OrthancInitialization.cpp OrthancServer/OrthancRestApi/OrthancRestResources.cpp OrthancServer/OrthancRestApi/OrthancRestSystem.cpp OrthancServer/ServerContext.cpp OrthancServer/ServerContext.h OrthancServer/main.cpp Plugins/Engine/IPluginServiceProvider.h Plugins/Engine/OrthancPluginDatabase.cpp Plugins/Engine/OrthancPluginDatabase.h Plugins/Engine/OrthancPlugins.cpp Plugins/Engine/OrthancPlugins.h Plugins/Engine/PluginsEnumerations.cpp Plugins/Engine/PluginsEnumerations.h Plugins/Engine/PluginsErrorDictionary.cpp Plugins/Engine/PluginsErrorDictionary.h Plugins/Engine/PluginsManager.cpp Plugins/Engine/PluginsManager.h Plugins/Engine/SharedLibrary.cpp Plugins/Engine/SharedLibrary.h Plugins/Samples/DatabasePlugin/CMakeLists.txt Resources/CMake/PugixmlConfiguration.cmake UnitTestsSources/JpegLosslessTests.cpp UnitTestsSources/PluginsTests.cpp UnitTestsSources/RestApiTests.cpp UnitTestsSources/UnitTestsMain.cpp UnitTestsSources/VersionsTests.cpp
diffstat 37 files changed, 89 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Nov 09 13:42:33 2016 +0100
+++ b/CMakeLists.txt	Wed Nov 09 14:08:05 2016 +0100
@@ -308,31 +308,31 @@
 
 
 if (ENABLE_SSL)
-  add_definitions(-DORTHANC_SSL_ENABLED=1)
+  add_definitions(-DORTHANC_ENABLE_SSL=1)
   include(${CMAKE_SOURCE_DIR}/Resources/CMake/OpenSslConfiguration.cmake)
 else()
-  add_definitions(-DORTHANC_SSL_ENABLED=0)
+  add_definitions(-DORTHANC_ENABLE_SSL=0)
 endif()
 
 
 if (ENABLE_JPEG)
-  add_definitions(-DORTHANC_JPEG_ENABLED=1)
+  add_definitions(-DORTHANC_ENABLE_JPEG=1)
 else()
-  add_definitions(-DORTHANC_JPEG_ENABLED=0)
+  add_definitions(-DORTHANC_ENABLE_JPEG=0)
 endif()
 
 
 if (ENABLE_JPEG_LOSSLESS)
-  add_definitions(-DORTHANC_JPEG_LOSSLESS_ENABLED=1)
+  add_definitions(-DORTHANC_ENABLE_JPEG_LOSSLESS=1)
 else()
-  add_definitions(-DORTHANC_JPEG_LOSSLESS_ENABLED=0)
+  add_definitions(-DORTHANC_ENABLE_JPEG_LOSSLESS=0)
 endif()
 
 
 if (ENABLE_PLUGINS)
-  add_definitions(-DORTHANC_PLUGINS_ENABLED=1)
+  add_definitions(-DORTHANC_ENABLE_PLUGINS=1)
 else()
-  add_definitions(-DORTHANC_PLUGINS_ENABLED=0)
+  add_definitions(-DORTHANC_ENABLE_PLUGINS=0)
 endif()
 
 
@@ -340,13 +340,13 @@
   if (ENABLE_SSL)
     include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibP11Configuration.cmake)
 
-    add_definitions(-DORTHANC_PKCS11_ENABLED=1)
+    add_definitions(-DORTHANC_ENABLE_PKCS11=1)
     list(APPEND ORTHANC_CORE_SOURCES Core/Pkcs11.cpp)
   else()
     message(FATAL_ERROR "OpenSSL is required to enable PKCS#11")
   endif()
 else()
-  add_definitions(-DORTHANC_PKCS11_ENABLED=0)  
+  add_definitions(-DORTHANC_ENABLE_PKCS11=0)  
 endif()
 
 
--- a/Core/HttpClient.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/HttpClient.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -44,7 +44,7 @@
 #include <boost/thread/mutex.hpp>
 
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
 // For OpenSSL initialization and finalization
 #  include <openssl/conf.h>
 #  include <openssl/engine.h>
@@ -54,7 +54,7 @@
 #endif
 
 
-#if ORTHANC_PKCS11_ENABLED == 1
+#if ORTHANC_ENABLE_PKCS11 == 1
 #  include "Pkcs11.h"
 #endif
 
@@ -161,7 +161,7 @@
       return timeout_;
     }
 
-#if ORTHANC_PKCS11_ENABLED == 1
+#if ORTHANC_ENABLE_PKCS11 == 1
     bool IsPkcs11Initialized()
     {
       boost::mutex::scoped_lock lock(mutex_);
@@ -435,7 +435,7 @@
       CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HEADERDATA, &headerParameters));
     }
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
     // Setup HTTPS-related options
 
     if (verifyPeers_)
@@ -461,7 +461,7 @@
 
     if (pkcs11Enabled_)
     {
-#if ORTHANC_PKCS11_ENABLED == 1
+#if ORTHANC_ENABLE_PKCS11 == 1
       if (GlobalParameters::GetInstance().IsPkcs11Initialized())
       {
         CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLENGINE, Pkcs11::GetEngineIdentifier()));
@@ -480,7 +480,7 @@
     }
     else if (!clientCertificateFile_.empty())
     {
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
       CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERTTYPE, "PEM"));
       CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERT, clientCertificateFile_.c_str()));
 
@@ -671,7 +671,7 @@
   void HttpClient::ConfigureSsl(bool httpsVerifyPeers,
                                 const std::string& httpsVerifyCertificates)
   {
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
     if (httpsVerifyPeers)
     {
       if (httpsVerifyCertificates.empty())
@@ -696,7 +696,7 @@
   
   void HttpClient::GlobalInitialize()
   {
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
     CheckCode(curl_global_init(CURL_GLOBAL_ALL));
 #else
     CheckCode(curl_global_init(CURL_GLOBAL_ALL & ~CURL_GLOBAL_SSL));
@@ -708,7 +708,7 @@
   {
     curl_global_cleanup();
 
-#if ORTHANC_PKCS11_ENABLED == 1
+#if ORTHANC_ENABLE_PKCS11 == 1
     Pkcs11::Finalize();
 #endif
   }
@@ -796,7 +796,7 @@
                                     const std::string& pin,
                                     bool verbose)
   {
-#if ORTHANC_PKCS11_ENABLED == 1
+#if ORTHANC_ENABLE_PKCS11 == 1
     LOG(INFO) << "Initializing PKCS#11 using " << module 
               << (pin.empty() ? " (no PIN provided)" : " (PIN is provided)");
     GlobalParameters::GetInstance().InitializePkcs11(module, pin, verbose);    
@@ -809,7 +809,7 @@
 
   void HttpClient::InitializeOpenSsl()
   {
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
     // https://wiki.openssl.org/index.php/Library_Initialization
     SSL_library_init();
     SSL_load_error_strings();
@@ -821,7 +821,7 @@
 
   void HttpClient::FinalizeOpenSsl()
   {
- #if ORTHANC_SSL_ENABLED == 1
+ #if ORTHANC_ENABLE_SSL == 1
     // Finalize OpenSSL
     // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
     FIPS_mode_set(0);
--- a/Core/HttpServer/MongooseServer.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/HttpServer/MongooseServer.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <boost/thread.hpp>
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
 #include <openssl/opensslv.h>
 #endif
 
@@ -874,7 +874,7 @@
     httpCompression_ = true;
     exceptionFormatter_ = NULL;
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
     // Check for the Heartbleed exploit
     // https://en.wikipedia.org/wiki/OpenSSL#Heartbleed_bug
     if (OPENSSL_VERSION_NUMBER <  0x1000107fL  /* openssl-1.0.1g */ &&
@@ -975,7 +975,7 @@
   {
     Stop();
 
-#if ORTHANC_SSL_ENABLED == 0
+#if ORTHANC_ENABLE_SSL == 0
     if (enabled)
     {
       throw OrthancException(ErrorCode_SslDisabled);
--- a/Core/Pkcs11.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/Pkcs11.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "PrecompiledHeaders.h"
 #include "Pkcs11.h"
 
-#if ORTHANC_PKCS11_ENABLED != 1 || ORTHANC_SSL_ENABLED != 1
+#if ORTHANC_ENABLE_PKCS11 != 1 || ORTHANC_ENABLE_SSL != 1
 #  error This file cannot be used if OpenSSL or PKCS#11 support is disabled
 #endif
 
--- a/Core/Pkcs11.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/Pkcs11.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PKCS11_ENABLED != 1 || ORTHANC_SSL_ENABLED != 1
+#if ORTHANC_ENABLE_PKCS11 != 1 || ORTHANC_ENABLE_SSL != 1
 #  error This file cannot be used if OpenSSL or PKCS#11 support is disabled
 #endif
 
--- a/Core/PrecompiledHeaders.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/PrecompiledHeaders.h	Wed Nov 09 14:08:05 2016 +0100
@@ -48,7 +48,7 @@
 
 #include <json/value.h>
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
 #include <pugixml.hpp>
 #endif
 
--- a/Core/RestApi/RestApi.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/RestApi/RestApi.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -185,7 +185,7 @@
   {
     RestApiOutput wrappedOutput(output, method);
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
     {
       // Look if the client wishes XML answers instead of JSON
       // http://www.w3.org/Protocols/HTTP/HTRQ_Headers.html#z3
--- a/Core/RestApi/RestApiOutput.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/RestApi/RestApiOutput.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -91,7 +91,7 @@
 
     if (convertJsonToXml_)
     {
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
       std::string s;
       Toolbox::JsonToXml(s, value);
       output_.SetContentType("application/xml; charset=utf-8");
--- a/Core/Toolbox.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/Toolbox.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -103,7 +103,7 @@
 #endif
 
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
 #include "ChunkedBuffer.h"
 #include <pugixml.hpp>
 #endif
@@ -1207,7 +1207,7 @@
 #endif
 
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
   class ChunkedBufferWriter : public pugi::xml_writer
   {
   private:
--- a/Core/Toolbox.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Core/Toolbox.h	Wed Nov 09 14:08:05 2016 +0100
@@ -198,7 +198,7 @@
     bool IsExistingFile(const std::string& path);
 #endif
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
     void JsonToXml(std::string& target,
                    const Json::Value& source,
                    const std::string& rootElement = "root",
--- a/OrthancServer/Internals/DicomImageDecoder.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/Internals/DicomImageDecoder.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -94,13 +94,13 @@
 #include <dcmtk/dcmdata/dcrleccd.h>
 #include <dcmtk/dcmdata/dcrlecp.h>
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
 #  include <dcmtk/dcmjpls/djcodecd.h>
 #  include <dcmtk/dcmjpls/djcparam.h>
 #  include <dcmtk/dcmjpeg/djrplol.h>
 #endif
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
 #  include <dcmtk/dcmjpeg/djcodecd.h>
 #  include <dcmtk/dcmjpeg/djcparam.h>
 #  include <dcmtk/dcmjpeg/djdecbas.h>
@@ -517,7 +517,7 @@
     }
 
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
     /**
      * Deal with JPEG-LS images.
      **/
@@ -549,7 +549,7 @@
 #endif
 
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
     /**
      * Deal with JPEG images.
      **/
--- a/OrthancServer/OrthancInitialization.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/OrthancInitialization.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -50,12 +50,12 @@
 #include <boost/thread.hpp>
 
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
 #  include <dcmtk/dcmjpeg/djdecode.h>
 #endif
 
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
 #  include <dcmtk/dcmjpls/djdecode.h>
 #endif
 
@@ -484,12 +484,12 @@
     FromDcmtkBridge::InitializeDictionary();
     LoadCustomDictionary(configuration_);
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
     LOG(WARNING) << "Registering JPEG Lossless codecs";
     DJLSDecoderRegistration::registerCodecs();    
 #endif
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
     LOG(WARNING) << "Registering JPEG codecs";
     DJDecoderRegistration::registerCodecs(); 
 #endif
@@ -507,12 +507,12 @@
     boost::recursive_mutex::scoped_lock lock(globalMutex_);
     HttpClient::GlobalFinalize();
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
     // Unregister JPEG-LS codecs
     DJLSDecoderRegistration::cleanup();
 #endif
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
     // Unregister JPEG codecs
     DJDecoderRegistration::cleanup();
 #endif
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -378,7 +378,7 @@
     {
       std::string publicId = call.GetUriComponent("id", "");
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
       if (context.GetPlugins().HasCustomImageDecoder())
       {
         // TODO create a cache of file
@@ -455,7 +455,7 @@
     std::string dicomContent;
     context.ReadDicom(dicomContent, publicId);
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     IDicomImageDecoder& decoder = context.GetPlugins();
 #else
     DefaultDicomImageDecoder decoder;  // This is Orthanc's built-in decoder
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -63,7 +63,7 @@
     result["StorageAreaPlugin"] = Json::nullValue;
     result["DatabaseBackendPlugin"] = Json::nullValue;
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     result["PluginsEnabled"] = true;
     const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
 
@@ -153,7 +153,7 @@
 
     if (OrthancRestApi::GetContext(call).HasPlugins())
     {
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
       std::list<std::string> plugins;
       OrthancRestApi::GetContext(call).GetPlugins().GetManager().ListPlugins(plugins);
 
@@ -176,7 +176,7 @@
       return;
     }
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPlugins().GetManager();
     std::string id = call.GetUriComponent("id", "");
 
@@ -224,7 +224,7 @@
 
     if (OrthancRestApi::GetContext(call).HasPlugins())
     {
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
       const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
       const PluginsManager& manager = plugins.GetManager();
 
--- a/OrthancServer/ServerContext.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/ServerContext.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -121,7 +121,7 @@
     dicomCache_(provider_, DICOM_CACHE_SIZE),
     scheduler_(Configuration::GetGlobalUnsignedIntegerParameter("LimitJobs", 10)),
     lua_(*this),
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     plugins_(NULL),
 #endif
     done_(false),
@@ -537,7 +537,7 @@
   }
 
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   void ServerContext::SetPlugins(OrthancPlugins& plugins)
   {
     boost::recursive_mutex::scoped_lock lock(listenersMutex_);
@@ -592,7 +592,7 @@
 
   bool ServerContext::HasPlugins() const
   {
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     return (plugins_ != NULL);
 #else
     return false;
--- a/OrthancServer/ServerContext.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/ServerContext.h	Wed Nov 09 14:08:05 2016 +0100
@@ -120,7 +120,7 @@
 
     LuaScripting lua_;
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     OrthancPlugins* plugins_;
 #endif
 
@@ -266,7 +266,7 @@
      * Management of the plugins
      **/
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
     void SetPlugins(OrthancPlugins& plugins);
 
     void ResetPlugins();
--- a/OrthancServer/main.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/main.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -370,7 +370,7 @@
     {
       bool isPlugin = false;
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
       if (plugins_ != NULL)
       {
         plugins_->GetErrorDictionary().LogError(exception.GetErrorCode(), true);
@@ -391,7 +391,7 @@
     {
       bool isPlugin = false;
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
       if (plugins_ != NULL &&
           plugins_->GetErrorDictionary().Format(message, httpStatus, exception))
       {
@@ -621,7 +621,7 @@
 
 
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 static void LoadPlugins(OrthancPlugins& plugins)
 {
   std::list<std::string> path;
@@ -644,7 +644,7 @@
 {
   LOG(WARNING) << "Orthanc has started";
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   if (context.HasPlugins())
   {
     context.GetPlugins().SignalOrthancStarted();
@@ -687,7 +687,7 @@
 
   context.GetLua().Execute("Finalize");
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   if (context.HasPlugins())
   {
     context.GetPlugins().SignalOrthancStopped();
@@ -788,7 +788,7 @@
   dicomServer.SetAssociationTimeout(Configuration::GetGlobalUnsignedIntegerParameter("DicomScpTimeout", 30));
 
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   if (plugins != NULL)
   {
     if (plugins->HasWorklistHandler())
@@ -852,7 +852,7 @@
 static bool ConfigureHttpHandler(ServerContext& context,
                                  OrthancPlugins *plugins)
 {
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   // By order of priority, first apply the "plugins" layer, so that
   // plugins can overwrite the built-in REST API of Orthanc
   if (plugins)
@@ -968,7 +968,7 @@
 
   LoadLuaScripts(context);
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   if (plugins)
   {
     plugins->SetServerContext(context);
@@ -990,7 +990,7 @@
 
   context.Stop();
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   if (plugins)
   {
     plugins->ResetServerContext();
@@ -1034,7 +1034,7 @@
   std::auto_ptr<IDatabaseWrapper>  databasePtr;
   std::auto_ptr<IStorageArea>  storage;
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
   OrthancPlugins plugins;
   plugins.SetCommandLineArguments(argc, argv);
   LoadPlugins(plugins);
@@ -1066,7 +1066,7 @@
 
   return ConfigureDatabase(*database, *storage, &plugins, allowDatabaseUpgrade);
 
-#elif ORTHANC_PLUGINS_ENABLED == 0
+#elif ORTHANC_ENABLE_PLUGINS == 0
   // The plugins are disabled
   databasePtr.reset(Configuration::CreateDatabaseWrapper());
   storage.reset(Configuration::CreateStorageArea());
@@ -1074,7 +1074,7 @@
   return ConfigureDatabase(*databasePtr, *storage, NULL, allowDatabaseUpgrade);
 
 #else
-#  error The macro ORTHANC_PLUGINS_ENABLED must be set to 0 or 1
+#  error The macro ORTHANC_ENABLE_PLUGINS must be set to 0 or 1
 #endif
 }
 
--- a/Plugins/Engine/IPluginServiceProvider.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/IPluginServiceProvider.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "../Include/orthanc/OrthancCPlugin.h"
 
--- a/Plugins/Engine/OrthancPluginDatabase.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/OrthancPluginDatabase.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "OrthancPluginDatabase.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/OrthancPluginDatabase.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/OrthancPluginDatabase.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "../../OrthancServer/IDatabaseWrapper.h"
 #include "../Include/orthanc/OrthancCDatabasePlugin.h"
--- a/Plugins/Engine/OrthancPlugins.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/OrthancPlugins.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "OrthancPlugins.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/OrthancPlugins.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/OrthancPlugins.h	Wed Nov 09 14:08:05 2016 +0100
@@ -34,7 +34,7 @@
 
 #include "PluginsErrorDictionary.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 
 #include <boost/noncopyable.hpp>
 
--- a/Plugins/Engine/PluginsEnumerations.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsEnumerations.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "PluginsEnumerations.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/PluginsEnumerations.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsEnumerations.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "../Include/orthanc/OrthancCPlugin.h"
 #include "../../OrthancServer/ServerEnumerations.h"
--- a/Plugins/Engine/PluginsErrorDictionary.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsErrorDictionary.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "PluginsErrorDictionary.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/PluginsErrorDictionary.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsErrorDictionary.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "../Include/orthanc/OrthancCPlugin.h"
 #include "../../Core/OrthancException.h"
--- a/Plugins/Engine/PluginsManager.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsManager.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "PluginsManager.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/PluginsManager.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/PluginsManager.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "SharedLibrary.h"
 #include "IPluginServiceProvider.h"
--- a/Plugins/Engine/SharedLibrary.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/SharedLibrary.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
 #include "../../OrthancServer/PrecompiledHeadersServer.h"
 #include "SharedLibrary.h"
 
-#if ORTHANC_PLUGINS_ENABLED != 1
+#if ORTHANC_ENABLE_PLUGINS != 1
 #error The plugin support is disabled
 #endif
 
--- a/Plugins/Engine/SharedLibrary.h	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Engine/SharedLibrary.h	Wed Nov 09 14:08:05 2016 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 #include "../../Core/OrthancException.h"
 
--- a/Plugins/Samples/DatabasePlugin/CMakeLists.txt	Wed Nov 09 13:42:33 2016 +0100
+++ b/Plugins/Samples/DatabasePlugin/CMakeLists.txt	Wed Nov 09 14:08:05 2016 +0100
@@ -33,7 +33,7 @@
   -DORTHANC_ENABLE_BASE64=0
   -DORTHANC_ENABLE_MD5=0
   -DORTHANC_ENABLE_DCMTK=0
-  -DORTHANC_PLUGINS_ENABLED=1
+  -DORTHANC_ENABLE_PLUGINS=1
   -DSAMPLE_DATABASE_VERSION="${SAMPLE_DATABASE_VERSION}"
   )
 
--- a/Resources/CMake/PugixmlConfiguration.cmake	Wed Nov 09 13:42:33 2016 +0100
+++ b/Resources/CMake/PugixmlConfiguration.cmake	Wed Nov 09 14:08:05 2016 +0100
@@ -1,5 +1,5 @@
 if (USE_PUGIXML)
-  add_definitions(-DORTHANC_PUGIXML_ENABLED=1)
+  add_definitions(-DORTHANC_ENABLE_PUGIXML=1)
 
   if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML)
     set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.4)
@@ -29,5 +29,5 @@
   source_group(ThirdParty\\pugixml REGULAR_EXPRESSION ${PUGIXML_SOURCES_DIR}/.*)
 
 else()
-  add_definitions(-DORTHANC_PUGIXML_ENABLED=0)
+  add_definitions(-DORTHANC_ENABLE_PUGIXML=0)
 endif()
--- a/UnitTestsSources/JpegLosslessTests.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/UnitTestsSources/JpegLosslessTests.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -35,7 +35,7 @@
 
 #include "../OrthancServer/Internals/DicomImageDecoder.h"
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 
--- a/UnitTestsSources/PluginsTests.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/UnitTestsSources/PluginsTests.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -38,7 +38,7 @@
 using namespace Orthanc;
 
 
-#if ORTHANC_PLUGINS_ENABLED == 1
+#if ORTHANC_ENABLE_PLUGINS == 1
 
 TEST(SharedLibrary, Enumerations)
 {
--- a/UnitTestsSources/RestApiTests.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/UnitTestsSources/RestApiTests.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -73,7 +73,7 @@
 }
 
 
-#if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1 && ORTHANC_SSL_ENABLED == 1
+#if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1 && ORTHANC_ENABLE_SSL == 1
 
 /**
    The HTTPS CA certificates for BitBucket were extracted as follows:
--- a/UnitTestsSources/UnitTestsMain.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -871,7 +871,7 @@
 
 
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
 TEST(Toolbox, Xml)
 {
   Json::Value a;
--- a/UnitTestsSources/VersionsTests.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/UnitTestsSources/VersionsTests.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -44,7 +44,7 @@
 #include <lua.h>
 #include <jpeglib.h>
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
 #include <openssl/opensslv.h>
 #endif
 
@@ -130,7 +130,7 @@
   // Check that SSL support is enabled when required
   bool curlSupportsSsl = (vinfo->features & CURL_VERSION_SSL) != 0;
 
-#if ORTHANC_SSL_ENABLED == 0
+#if ORTHANC_ENABLE_SSL == 0
   ASSERT_FALSE(curlSupportsSsl);
 #else
   ASSERT_TRUE(curlSupportsSsl);
@@ -143,7 +143,7 @@
 }
 
 
-#if ORTHANC_SSL_ENABLED == 1
+#if ORTHANC_ENABLE_SSL == 1
 TEST(Version, OpenSslStatic)
 {
   ASSERT_EQ(0x1000204fL /* openssl-1.0.2d */, OPENSSL_VERSION_NUMBER);