From 8fc46f6ea174db8ae539eed287bfe656a7a71afc Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Wed, 15 Feb 2023 09:29:37 +0000 Subject: [PATCH] Remove POCO_DLL --- base/poco/Foundation/include/Poco/Foundation.h | 7 ------- base/poco/Foundation/src/EventLogChannel.cpp | 7 ------- base/poco/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h | 7 ------- 3 files changed, 21 deletions(-) diff --git a/base/poco/Foundation/include/Poco/Foundation.h b/base/poco/Foundation/include/Poco/Foundation.h index 747cff7818c..34493041720 100644 --- a/base/poco/Foundation/include/Poco/Foundation.h +++ b/base/poco/Foundation/include/Poco/Foundation.h @@ -39,13 +39,6 @@ // Foundation_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // -#if (defined(_WIN32) || defined(_WIN32_WCE)) && defined(POCO_DLL) -# if defined(Foundation_EXPORTS) -# define Foundation_API __declspec(dllexport) -# else -# define Foundation_API __declspec(dllimport) -# endif -#endif #if !defined(Foundation_API) diff --git a/base/poco/Foundation/src/EventLogChannel.cpp b/base/poco/Foundation/src/EventLogChannel.cpp index 33a19cef967..ec35a9b5d28 100644 --- a/base/poco/Foundation/src/EventLogChannel.cpp +++ b/base/poco/Foundation/src/EventLogChannel.cpp @@ -184,13 +184,6 @@ void EventLogChannel::setUpRegistry() const if (disp == REG_CREATED_NEW_KEY) { std::string path; - #if defined(POCO_DLL) - #if defined(_DEBUG) - path = findLibrary("PocoFoundationd.dll"); - #else - path = findLibrary("PocoFoundation.dll"); - #endif - #endif if (path.empty()) path = findLibrary("PocoMsg.dll"); diff --git a/base/poco/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/base/poco/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h index d6c7eba1a3d..5c3b45be8c6 100644 --- a/base/poco/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h +++ b/base/poco/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h @@ -32,13 +32,6 @@ // NetSSL_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // -#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(POCO_DLL) -# if defined(NetSSL_EXPORTS) -# define NetSSL_API __declspec(dllexport) -# else -# define NetSSL_API __declspec(dllimport) -# endif -#endif #if !defined(NetSSL_API)