diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
| commit | 1d0f70c2f894b27e98773a282871d32802f67964 (patch) | |
| tree | 833e683e0ced29c4323c29a9d845703d4dfcd81b /mysys/md5.c | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| download | mariadb-git-1d0f70c2f894b27e98773a282871d32802f67964.tar.gz | |
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
Diffstat (limited to 'mysys/md5.c')
| -rw-r--r-- | mysys/md5.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mysys/md5.c b/mysys/md5.c index 22a5e409a09..b3b0a470369 100644 --- a/mysys/md5.c +++ b/mysys/md5.c @@ -38,13 +38,15 @@ copyright in any changes I have made; this code remains in the public domain. */ +/* + Skip entirely if built with OpenSSL/YaSSL support. +*/ +#if !defined(HAVE_OPENSSL) && !defined(HAVE_YASSL) + #include <my_global.h> #include <m_string.h> #include "my_md5.h" -#include <string.h> /* for memcpy() and memset() */ - - static void my_MD5Transform (cvs_uint32 buf[4], const unsigned char in[64]); @@ -323,3 +325,5 @@ main (int argc, char **argv) return 0; } #endif /* TEST */ + +#endif /* !defined(HAVE_OPENSSL) && !defined(HAVE_YASSL) */ |