[Pkg-gnupg-commit] [gpgme] 35/412: Fix export header and windows export macros

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 98e5b672422ca1e38ca38ff0357cee6cc936aee0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Mar 2 16:24:09 2016 +0100

    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 50a288d..c24bda0 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git