2 files changed, 15 insertions, 6 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index df86c77b149..cf5a401118d 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -94,12 +94,7 @@ typedef double Double;
 namespace IceInternal
 {
 
-// TODO: Should not be inline, this is not performance critical.
-#ifdef _WIN32
-inline int getSystemErrno() { return GetLastError(); }
-#else
-inline int getSystemErrno() { return errno; }
-#endif
+ICE_API int getSystemErrno();
 
 }
 
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index cc7cd41a812..f4c6924c74d 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -87,6 +87,20 @@ using namespace Windows::Networking::Sockets;
 using namespace Windows::Networking::Connectivity;
 #endif
 
+#ifdef _WIN32
+int
+IceInternal::getSystemErrno()
+{
+    return GetLastError();
+}
+#else
+int
+IceInternal::getSystemErrno()
+{
+    return errno;
+}
+#endif
+
 namespace
 {