summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-04-13 20:10:51 +0400
committerAlexander Nozdrin <alik@sun.com>2010-04-13 20:10:51 +0400
commitfad9478ebad33523bf66e65930056929847cb7b1 (patch)
tree118a6e24455aabfaecf433cbe6939b235234550e /include
parent53fecff1ef023e5020d17dbe38ec8ee4fa499d12 (diff)
downloadmariadb-git-fad9478ebad33523bf66e65930056929847cb7b1.tar.gz
Post-fix for Bug#13174.
Diffstat (limited to 'include')
-rw-r--r--include/sha2.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/sha2.h b/include/sha2.h
index 3c10be8958c..e67a4100ff2 100644
--- a/include/sha2.h
+++ b/include/sha2.h
@@ -18,11 +18,16 @@
#include <my_config.h>
+#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
+
+# ifdef HAVE_STDDEF_H
+# include <stddef.h>
+# endif
+
# ifndef HAVE_YASSL
# include <openssl/sha.h>
-# endif
-# ifdef HAVE_YASSL
+# else
#include "../extra/yassl/taocrypt/include/sha.hpp"
@@ -63,4 +68,5 @@ GEN_YASSL_SHA2_BRIDGE(224);
# endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL || HAVE_YASSL */
#endif /* included_sha2_h */