summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-09-10 19:12:51 +0000
committerJose <jose@zeroc.com>2018-09-10 19:12:51 +0000
commit72110f428dbcac44a647d181c37b33e17e5aa0cc (patch)
treea74d66b0a26545a2a9ae562708d67fa2d0ff3cc7
parentPython 3.x fix for slicing/objects test (diff)
downloadice-72110f428dbcac44a647d181c37b33e17e5aa0cc.tar.bz2
ice-72110f428dbcac44a647d181c37b33e17e5aa0cc.tar.xz
ice-72110f428dbcac44a647d181c37b33e17e5aa0cc.zip
Fix build failure using recent OpenSSL Versions
We need to include openssl/opensslv.h to get OPENSSL_VERSION_NUMBER definition
-rw-r--r--cpp/src/Glacier2/CryptPermissionsVerifierI.cpp1
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp
index 34ced201049..7a149027e93 100644
--- a/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp
@@ -8,6 +8,7 @@
// **********************************************************************
#include <Glacier2/CryptPermissionsVerifierI.h>
+#include <openssl/opensslv.h>
#include <openssl/des.h>
// Ignore OS X OpenSSL deprecation warnings
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index d31f19b1a66..b5f44985fb1 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -40,6 +40,7 @@
#include <fstream>
+#include <openssl/opensslv.h>
#include <openssl/des.h> // For crypt() passwords
#include <sys/types.h>