diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-23 13:36:25 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-23 13:36:25 +0300 |
| commit | 58ec8f35f7a92005b1a06f8d071b56649ca43857 (patch) | |
| tree | b593284eb804b90e72044fd9fc3f716bab425789 /include | |
| parent | a86e11ef153433cf52886692c493e90784e10ee2 (diff) | |
| parent | f46ca5fbe905caa7efb3f3cafdbdcc7c0f83a2b0 (diff) | |
| download | mariadb-git-58ec8f35f7a92005b1a06f8d071b56649ca43857.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
extra/comp_err.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d08977a7cd..59e0c43f18d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1105,4 +1105,14 @@ 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 */ |