diff options
| author | monty@mysql.com <> | 2004-06-21 10:24:40 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-21 10:24:40 +0300 |
| commit | d69a36d11803887272742247a546ba593d4d95c3 (patch) | |
| tree | 0e02d42f7a1f1f532c1d780d1c57097202d7369d /include | |
| parent | 9ddd3ad5ec24c3adc137861af0323c8d624a301c (diff) | |
| parent | 1388c164bcd235c9612961bc902cd9e77b079a89 (diff) | |
| download | mariadb-git-d69a36d11803887272742247a546ba593d4d95c3.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 | ||||
| -rw-r--r-- | include/violite.h | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/include/my_global.h b/include/my_global.h index ca45406355e..70b5b1af819 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1186,16 +1186,6 @@ do { doubleget_union _tmp; \ #define statistic_add(V,C,L) (V)+=(C) #endif -#ifdef HAVE_OPENSSL -#include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x0090700f -#define DES_cblock des_cblock -#define DES_key_schedule des_key_schedule -#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks)) -#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e)) -#endif -#endif - #ifdef HAVE_CHARSET_utf8 #define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8" #else diff --git a/include/violite.h b/include/violite.h index b4b9f724d89..ba7de3ee175 100644 --- a/include/violite.h +++ b/include/violite.h @@ -83,6 +83,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout); void vio_timeout(Vio *vio,uint timeout); #ifdef HAVE_OPENSSL +#include <openssl/opensslv.h> +#if OPENSSL_VERSION_NUMBER < 0x0090700f +#define DES_cblock des_cblock +#define DES_key_schedule des_key_schedule +#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks)) +#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e)) +#endif + #define HEADER_DES_LOCL_H dummy_something #include <openssl/ssl.h> #include <openssl/err.h> |