diff Plugins/Samples/Common/OrthancPluginCppWrapper.h @ 3410:3575466a3e57

introduction of macro HAS_ORTHANC_FRAMEWORK to be more explicit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 08 Jun 2019 17:42:30 +0200
parents b7728227a852
children f09bfdea3fc3
line wrap: on
line diff
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Sat Jun 08 16:49:35 2019 +0200
+++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Sat Jun 08 17:42:30 2019 +0200
@@ -59,9 +59,11 @@
 
 #if !defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE)
 #define ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(major, minor, revision)      \
-  (defined(ORTHANC_FRAMEWORK_VERSION_MAJOR) &&                          \
+  (defined(HAS_ORTHANC_FRAMEWORK) &&                                    \
+   defined(ORTHANC_FRAMEWORK_VERSION_MAJOR) &&                          \
    defined(ORTHANC_FRAMEWORK_VERSION_MINOR) &&                          \
    defined(ORTHANC_FRAMEWORK_VERSION_REVISION) &&                       \
+   HAS_ORTHANC_FRAMEWORK == 1 &&                                        \
    ORTHANC_FRAMEWORK_VERSION_MAJOR > major ||                           \
    (ORTHANC_FRAMEWORK_VERSION_MAJOR == major &&                         \
     (ORTHANC_FRAMEWORK_VERSION_MINOR > minor ||                         \