Mercurial > hg > orthanc

changeset 3999:44e2a8e0b6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ORTHANC_FRAMEWORK_BUILDING_LIBRARY
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Jun 2020 19:14:20 +0200
parents b3f09bc9734b
children 5f6c11a5e1f9
files CMakeLists.txt Core/OrthancFramework.h Resources/ThirdParty/minizip/zip.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Jun 05 18:56:35 2020 +0200
+++ b/CMakeLists.txt	Fri Jun 05 19:14:20 2020 +0200
@@ -251,7 +251,7 @@
 
 
 add_definitions(
-  -DORTHANC_FRAMEWORK_BUILDING_PLUGIN=0
+  -DORTHANC_FRAMEWORK_BUILDING_LIBRARY=0
   -DORTHANC_BUILD_UNIT_TESTS=1
   -DORTHANC_ENABLE_LOGGING_PLUGIN=0
   
--- a/Core/OrthancFramework.h	Fri Jun 05 18:56:35 2020 +0200
+++ b/Core/OrthancFramework.h	Fri Jun 05 19:14:20 2020 +0200
@@ -41,8 +41,8 @@
 #ifndef __ORTHANC_FRAMEWORK_H
 #define __ORTHANC_FRAMEWORK_H
 
-#if !defined(ORTHANC_FRAMEWORK_BUILDING_PLUGIN)
-#  error Macro ORTHANC_FRAMEWORK_BUILDING_PLUGIN must be defined
+#if !defined(ORTHANC_FRAMEWORK_BUILDING_LIBRARY)
+#  error Macro ORTHANC_FRAMEWORK_BUILDING_LIBRARY must be defined
 #endif
 
 /**
@@ -51,7 +51,7 @@
  * common "BUILDING_DLL"
  * construction. https://gcc.gnu.org/wiki/Visibility
  **/
-#if ORTHANC_FRAMEWORK_BUILDING_PLUGIN == 0
+#if ORTHANC_FRAMEWORK_BUILDING_LIBRARY == 1
 #  if defined(_WIN32) || defined (__CYGWIN__)
 #    define ORTHANC_PUBLIC __declspec(dllexport)
 #    define ORTHANC_LOCAL
--- a/Resources/ThirdParty/minizip/zip.c	Fri Jun 05 18:56:35 2020 +0200
+++ b/Resources/ThirdParty/minizip/zip.c	Fri Jun 05 19:14:20 2020 +0200
@@ -526,8 +526,8 @@
         break;
       }
 
-      if (uPosFound!=0)
-        break;
+    if (uPosFound!=0)
+      break;
   }
   TRYFREE(buf);
   return uPosFound;