diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-13 11:18:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-10-13 11:18:30 +0200 |
| commit | 02be50a58fb03d3c1970a71a7a378a2cde45d217 (patch) | |
| tree | d588ab345f1645b1b74b8e847290bdd07b2c350a /extra/yassl/testsuite/test.hpp | |
| parent | 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 (diff) | |
| parent | 5c6169fb309981b564a17bee31b367a18866d674 (diff) | |
| download | mariadb-git-02be50a58fb03d3c1970a71a7a378a2cde45d217.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'extra/yassl/testsuite/test.hpp')
| -rw-r--r-- | extra/yassl/testsuite/test.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp index 5374edd0e2a..a65a212cf99 100644 --- a/extra/yassl/testsuite/test.hpp +++ b/extra/yassl/testsuite/test.hpp @@ -22,7 +22,6 @@ #define yaSSL_TEST_HPP #include "runtime.hpp" -#include "openssl/ssl.h" /* openssl compatibility test */ #include "error.hpp" #include <stdio.h> #include <stdlib.h> @@ -56,6 +55,7 @@ #endif #define SOCKET_T int #endif /* _WIN32 */ +#include "openssl/ssl.h" /* openssl compatibility test */ #ifdef _MSC_VER |