merge

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 */