# HG changeset patch # User Sebastien Jodogne # Date 1591377260 -7200 # Node ID 44e2a8e0b6aea9e7f7e6d17270823f35ea009a90 # Parent b3f09bc9734ba03ecc3b99b5afb25f54236ddaba ORTHANC_FRAMEWORK_BUILDING_LIBRARY diff -r b3f09bc9734b -r 44e2a8e0b6ae CMakeLists.txt --- 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 diff -r b3f09bc9734b -r 44e2a8e0b6ae Core/OrthancFramework.h --- 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 diff -r b3f09bc9734b -r 44e2a8e0b6ae Resources/ThirdParty/minizip/zip.c --- 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;