summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2003-02-26 20:39:14 +0000
committerMark Spruiell <mes@zeroc.com>2003-02-26 20:39:14 +0000
commit6658b87af4be9878a2f44c71f5491047e2242abd (patch)
treeb0d2db7985168850f914e916ef5797466462f396 /cpp/src
parentminor fix (diff)
downloadice-6658b87af4be9878a2f44c71f5491047e2242abd.tar.bz2
ice-6658b87af4be9878a2f44c71f5491047e2242abd.tar.xz
ice-6658b87af4be9878a2f44c71f5491047e2242abd.zip
do not include crypt.h if OpenSSL 0.96 is used
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier/StarterI.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp
index 556cfec308e..5fe65689634 100644
--- a/cpp/src/Glacier/StarterI.cpp
+++ b/cpp/src/Glacier/StarterI.cpp
@@ -22,9 +22,10 @@
#include <fcntl.h>
//
-// crypt.h is necessary on older Linux distributions
+// crypt.h is necessary on older Linux distributions, but not with
+// OpenSSL 0.96x.
//
-#ifdef __linux__
+#if defined(__linux__) && OPENSSL_VERSION_NUMBER >= 0x0090700fL
# include <crypt.h>
#endif