summaryrefslogtreecommitdiff
path: root/include/sha2.h
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
commita3295460229d55d433a1e53199fa7b444db86a2d (patch)
tree118a6e24455aabfaecf433cbe6939b235234550e /include/sha2.h
parent3227ba706fac95367ed53a48966303bc996b1d7f (diff)
downloadmariadb-git-a3295460229d55d433a1e53199fa7b444db86a2d.tar.gz
Post-fix for Bug#13174.
Diffstat (limited to 'include/sha2.h')
-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 */