summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAnthony Neal <aneal@zeroc.com>2002-01-07 13:22:02 +0000
committerAnthony Neal <aneal@zeroc.com>2002-01-07 13:22:02 +0000
commit0ea080b903b95a25f5d806820f3500f8a1e33d54 (patch)
tree58693d6cd01bb5fdf6b0e81620e94653e8ceb415 /cpp/src
parentfile RouterInfo.h was initially added on branch glacier. (diff)
downloadice-0ea080b903b95a25f5d806820f3500f8a1e33d54.tar.bz2
ice-0ea080b903b95a25f5d806820f3500f8a1e33d54.tar.xz
ice-0ea080b903b95a25f5d806820f3500f8a1e33d54.zip
Fixed a compile bug that I checked in on Friday having to do with inclusion
of Security.h in SslConnectionOpenSSLServer.cpp
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/SslConnectionOpenSSLServer.cpp2
-rw-r--r--cpp/src/Ice/SslGeneralConfig.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
index 928cee9228d..3cd05384efc 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
@@ -11,7 +11,7 @@
#include <string>
#include <sstream>
#include <Ice/Network.h>
-// #include <Ice/Security.h>
+#include <Ice/Security.h>
#include <Ice/SecurityException.h>
#include <Ice/SslConnectionOpenSSLServer.h>
diff --git a/cpp/src/Ice/SslGeneralConfig.cpp b/cpp/src/Ice/SslGeneralConfig.cpp
index 5d32a43c9d9..c1d85c55ea0 100644
--- a/cpp/src/Ice/SslGeneralConfig.cpp
+++ b/cpp/src/Ice/SslGeneralConfig.cpp
@@ -14,7 +14,6 @@
#include <string>
#include <algorithm>
-#include <openssl/ssl.h>
#include <Ice/SslGeneralConfig.h>
using namespace std;