summaryrefslogtreecommitdiff
path: root/cpp/include/IceSSL/Plugin.h
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2015-02-18 10:29:49 -0330
committerMatthew Newhook <matthew@zeroc.com>2015-02-18 10:29:49 -0330
commitb55ce15878456e3d2f0656bcd6abd5a55c6774b1 (patch)
treee7e771a3d90ae7295f20bf0622b72c72cc3a85e0 /cpp/include/IceSSL/Plugin.h
parentFixed ObjC build (diff)
downloadice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.bz2
ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.xz
ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.zip
Changes for brew, python PyPI packaging and ruby gem packaging.
Diffstat (limited to 'cpp/include/IceSSL/Plugin.h')
-rw-r--r--cpp/include/IceSSL/Plugin.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index c5186c413cf..5a7e7ea86cc 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -21,10 +21,8 @@
//
// Automatically link IceSSL[D].lib with Visual C++
//
-#ifdef _MSC_VER
-# if defined(ICE_STATIC_LIBS)
-# error("IceSSL Plugin does not support static libraries")
-# elif !defined(ICE_SSL_API_EXPORTS)
+#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
+# if !defined(ICE_STATIC_LIBS) && !defined(ICE_SSL_API_EXPORTS)
# if defined(_DEBUG)
# pragma comment(lib, "IceSSLD.lib")
# else