6 files changed, 9 insertions, 7 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index c5ecce318c4..6acc0784de3 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -35,7 +35,7 @@
 //
 // Automatically link Ice[D].lib with Visual C++
 //
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
 #   if defined(ICE_STATIC_LIBS)
 #      pragma comment(lib, "Ice.lib")
 #   elif !defined(ICE_API_EXPORTS)
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
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 33408be817d..2436f620f97 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -170,7 +170,7 @@
 #   include <errno.h>
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
 #   if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT))
 #       error "Only multi-threaded DLL libraries can be used with Ice!"
 #   endif
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 19199e58613..d416ca6f18c 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -23,7 +23,7 @@
 //
 // Automatically link Slice[D].lib with Visual C++
 //
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
 #   if defined(ICE_STATIC_LIBS)
 #      pragma comment(lib, "Slice.lib")
 #   elif !defined(SLICE_API_EXPORTS)
diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h
index 8930bc42664..9d5db3c6c99 100644
--- a/cpp/include/Slice/PythonUtil.h
+++ b/cpp/include/Slice/PythonUtil.h
@@ -56,6 +56,8 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, const std::string&
 //
 SLICE_API void printHeader(IceUtilInternal::Output&);
 
+SLICE_API int compile(int, char*[]);
+
 }
 }
 
diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h
index 0095d286c55..4cb97a8826f 100644
--- a/cpp/include/Slice/RubyUtil.h
+++ b/cpp/include/Slice/RubyUtil.h
@@ -46,6 +46,8 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const
 //
 SLICE_API void printHeader(IceUtilInternal::Output&);
 
+SLICE_API int compile(int, char*[]);
+
 }
 }