summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-05-18 11:20:03 +0200
committerunknown <joerg@mysql.com>2006-05-18 11:20:03 +0200
commite3f1b06c5ade8ea026aba372f92dfc468599415b (patch)
treef1993ffd153577da1826aeb6ed53affdecd80ca8 /extra
parentde0e4a9a8fe58ff025554d6fe3db1641b3c9ffe4 (diff)
parent8d4cbe39a69e3d87ee00d05f26306caa8e2b296a (diff)
downloadmariadb-git-e3f1b06c5ade8ea026aba372f92dfc468599415b.tar.gz
Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M51/merge-5.1
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/include/runtime.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp
index 3a5cf62865a..09ca7524ef3 100644
--- a/extra/yassl/taocrypt/include/runtime.hpp
+++ b/extra/yassl/taocrypt/include/runtime.hpp
@@ -28,6 +28,10 @@
#ifndef yaSSL_NEW_HPP
#define yaSSL_NEW_HPP
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef __sun