From 98e5b672422ca1e38ca38ff0357cee6cc936aee0 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Wed, 2 Mar 2016 16:24:09 +0100 Subject: [PATCH] Fix export header and windows export macros * lang/cpp/src/gpgme_export.h: Fix variable name. Add Windows ifdefs. --- lang/cpp/src/gpgmepp_export.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lang/cpp/src/gpgmepp_export.h b/lang/cpp/src/gpgmepp_export.h index 50a288de..c24bda02 100644 --- a/lang/cpp/src/gpgmepp_export.h +++ b/lang/cpp/src/gpgmepp_export.h @@ -7,17 +7,29 @@ # define GPGMEPP_NO_EXPORT #else # ifndef GPGMEPP_EXPORT -# ifdef KF5Gpgmepp_EXPORTS +# ifdef BUILDING_GPGMEPP /* We are building this library */ -# define GPGMEPP_EXPORT __attribute__((visibility("default"))) +# ifdef WIN32 +# define GPGMEPP_EXPORT __declspec(dllexport) +# else +# define GPGMEPP_EXPORT __attribute__((visibility("default"))) +# endif # else /* We are using this library */ -# define GPGMEPP_EXPORT __attribute__((visibility("default"))) +# ifdef WIN32 +# define GPGMEPP_EXPORT __declspec(dllimport) +# else +# define GPGMEPP_EXPORT __attribute__((visibility("default"))) +# endif # endif # endif # ifndef GPGMEPP_NO_EXPORT -# define GPGMEPP_NO_EXPORT __attribute__((visibility("hidden"))) +# ifdef WIN32 +# define GPGMEPP_NO_EXPORT +# else +# define GPGMEPP_NO_EXPORT __attribute__((visibility("hidden"))) +# endif # endif #endif