diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-06-11 18:52:27 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-06-11 18:52:27 +0400 |
| commit | de389ee55e290063dbc5482734517d067a16e10c (patch) | |
| tree | a1771c501d821f92d83538caeb0d2572af64e210 | |
| parent | d4c72a852d6e554d606f8b40bdeb464b6b6f7855 (diff) | |
| parent | 85803ddf86b7e86708f8d4b7c1c3494351bbdb3d (diff) | |
| download | mariadb-git-de389ee55e290063dbc5482734517d067a16e10c.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
| -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 b68eaf383a9..284cfdc1f97 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1138,14 +1138,4 @@ typedef union { #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 - #endif /* my_global_h */ diff --git a/include/violite.h b/include/violite.h index 18f862d4b77..8464a6b8654 100644 --- a/include/violite.h +++ b/include/violite.h @@ -78,6 +78,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),( +#endif + #define HEADER_DES_LOCL_H dummy_something #include <openssl/ssl.h> #include <openssl/err.h> |