From fad9478ebad33523bf66e65930056929847cb7b1 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Tue, 13 Apr 2010 20:10:51 +0400
Subject: [PATCH] Post-fix for Bug#13174.

---
 include/sha2.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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>
 
-#  ifndef HAVE_YASSL
-#    include <openssl/sha.h>
+#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
+
+#  ifdef HAVE_STDDEF_H
+#    include <stddef.h>
 #  endif
 
-#  ifdef HAVE_YASSL
+#  ifndef HAVE_YASSL
+#    include <openssl/sha.h>
+
+#  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 */