Mercurial > hg > orthanc

changeset 4332:17d209a3f397

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix missing symbols for stone
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Nov 2020 21:42:50 +0100
parents 072adf3c3409
children a85e74235a78
files OrthancFramework/Sources/HttpServer/HttpToolbox.cpp OrthancFramework/Sources/HttpServer/HttpToolbox.h
diffstat 2 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/HttpServer/HttpToolbox.cpp	Wed Nov 25 18:15:28 2020 +0100
+++ b/OrthancFramework/Sources/HttpServer/HttpToolbox.cpp	Wed Nov 25 21:42:50 2020 +0100
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if ORTHANC_SANDBOXED != 1
+#if (ORTHANC_ENABLE_MONGOOSE == 1 || ORTHANC_ENABLE_CIVETWEB == 1)
 #  include "IHttpHandler.h"
 #endif
 
@@ -184,7 +184,7 @@
 
 
 
-#if ORTHANC_SANDBOXED != 1
+#if (ORTHANC_ENABLE_MONGOOSE == 1 || ORTHANC_ENABLE_CIVETWEB == 1)
   bool HttpToolbox::SimpleGet(std::string& result,
                               IHttpHandler& handler,
                               RequestOrigin origin,
--- a/OrthancFramework/Sources/HttpServer/HttpToolbox.h	Wed Nov 25 18:15:28 2020 +0100
+++ b/OrthancFramework/Sources/HttpServer/HttpToolbox.h	Wed Nov 25 21:42:50 2020 +0100
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#if !defined(ORTHANC_SANDBOXED)
-#  error Macro ORTHANC_SANDBOXED must be defined
-#endif
-
 #include "../Compatibility.h"
 #include "../OrthancFramework.h"
 #include "../Toolbox.h"
@@ -65,16 +61,14 @@
     static void CompileGetArguments(Arguments& compiled,
                                     const GetArguments& source);
 
-#if ORTHANC_SANDBOXED != 1
+#if (ORTHANC_ENABLE_MONGOOSE == 1 || ORTHANC_ENABLE_CIVETWEB == 1)
     ORTHANC_DEPRECATED
     static bool SimpleGet(std::string& result,
                           IHttpHandler& handler,
                           RequestOrigin origin,
                           const std::string& uri,
                           const Arguments& httpHeaders);
-#endif
-    
-#if ORTHANC_SANDBOXED != 1
+
     ORTHANC_DEPRECATED
     static bool SimplePost(std::string& result,
                            IHttpHandler& handler,
@@ -83,9 +77,7 @@
                            const void* bodyData,
                            size_t bodySize,
                            const Arguments& httpHeaders);
-#endif
 
-#if ORTHANC_SANDBOXED != 1
     ORTHANC_DEPRECATED
     static bool SimplePut(std::string& result,
                           IHttpHandler& handler,
@@ -94,9 +86,7 @@
                           const void* bodyData,
                           size_t bodySize,
                           const Arguments& httpHeaders);
-#endif
 
-#if ORTHANC_SANDBOXED != 1
     ORTHANC_DEPRECATED
     static bool SimpleDelete(IHttpHandler& handler,
                              RequestOrigin origin,