From 70578b09cfea7cd7a07cfcd89e2972b63e01d071 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Wed, 23 Aug 2023 10:27:05 -0700 Subject: [PATCH] declspec change --- .../include/aws/greengrass/Exports.h | 22 +++++++++---------- .../aws/greengrass/GreengrassCoreIpcClient.h | 4 ++-- .../aws/greengrass/GreengrassCoreIpcModel.h | 6 ++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/greengrass_ipc/include/aws/greengrass/Exports.h b/greengrass_ipc/include/aws/greengrass/Exports.h index f34362191..2ffa1af23 100644 --- a/greengrass_ipc/include/aws/greengrass/Exports.h +++ b/greengrass_ipc/include/aws/greengrass/Exports.h @@ -4,17 +4,17 @@ * SPDX-License-Identifier: Apache-2.0. */ -#if defined(AWS_GREENGRASS_USE_WINDOWS_DLL_SEMANTICS) || defined(WIN32) -# ifdef AWS_GREENGRASS_USE_IMPORT_EXPORT -# ifdef AWS_GREENGRASS_EXPORTS -# define AWS_GREENGRASS_API __declspec(dllexport) +#if defined(AWS_GREENGRASSIPC_USE_WINDOWS_DLL_SEMANTICS) || defined(WIN32) +# ifdef AWS_GREENGRASSIPC_USE_IMPORT_EXPORT +# ifdef AWS_GREENGRASSIPC_EXPORTS +# define AWS_GREENGRASSIPC_API __declspec(dllexport) # else -# define AWS_GREENGRASS_API __declspec(dllimport) -# endif /* AWS_GREENGRASS_EXPORTS */ +# define AWS_GREENGRASSIPC_API __declspec(dllimport) +# endif /* AWS_GREENGRASSIPC_EXPORTS */ # else -# define AWS_GREENGRASS_API -# endif /* AWS_GREENGRASS_USE_IMPORT_EXPORT */ +# define AWS_GREENGRASSIPC_API +# endif /* AWS_GREENGRASSIPC_USE_IMPORT_EXPORT */ -#else /* defined (AWS_GREENGRASS_USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32) */ -# define AWS_GREENGRASS_API -#endif /* defined (AWS_GREENGRASS__USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32) */ +#else /* defined (AWS_GREENGRASSIPC_USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32) */ +# define AWS_GREENGRASSIPC_API +#endif /* defined (AWS_GREENGRASSIPC__USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32) */ diff --git a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h index c2a633d4f..06538c7ac 100644 --- a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h +++ b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h @@ -16,13 +16,13 @@ namespace Aws { namespace Greengrass { - class AWS_GREENGRASS_API DefaultConnectionConfig : public ConnectionConfig + class AWS_GREENGRASSIPC_API DefaultConnectionConfig : public ConnectionConfig { public: DefaultConnectionConfig() noexcept; }; - class AWS_GREENGRASS_API GreengrassCoreIpcClient + class AWS_GREENGRASSIPC_API GreengrassCoreIpcClient { public: GreengrassCoreIpcClient( diff --git a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h index fcd682af8..6afefe054 100644 --- a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h +++ b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h @@ -19,8 +19,8 @@ namespace Aws { namespace Greengrass { - class AWS_GREENGRASS_API GreengrassCoreIpcClient; - class AWS_GREENGRASS_API GreengrassCoreIpcServiceModel; + class AWS_GREENGRASSIPC_API GreengrassCoreIpcClient; + class AWS_GREENGRASSIPC_API GreengrassCoreIpcServiceModel; class UserProperty : public AbstractShapeBase { public: @@ -5910,7 +5910,7 @@ namespace Aws Aws::Crt::String GetModelName() const noexcept override; }; - class AWS_GREENGRASS_API GreengrassCoreIpcServiceModel : public ServiceModel + class AWS_GREENGRASSIPC_API GreengrassCoreIpcServiceModel : public ServiceModel { public: GreengrassCoreIpcServiceModel() noexcept;