diff options
| author | Igor Babaev <igor@askmonty.org> | 2009-11-11 20:31:28 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2009-11-11 20:31:28 -0800 |
| commit | e4e1ae0d13da399d53bd91df791b149f3eae796b (patch) | |
| tree | 850b7b3404210b6bad604ad33b5c9a7437253dbe /extra | |
| parent | 99d8d4402080270289f00465309c7c40c2e5d566 (diff) | |
| parent | d749c7e60061fd328e95f74d2d77fc59312da3b1 (diff) | |
| download | mariadb-git-e4e1ae0d13da399d53bd91df791b149f3eae796b.tar.gz | |
Merge of the patch introducing virtual columns into maria-5.2
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libevent/event-internal.h | 5 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/twofish.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/extra/libevent/event-internal.h b/extra/libevent/event-internal.h index 19b7a547a84..9dd0c4d7632 100644 --- a/extra/libevent/event-internal.h +++ b/extra/libevent/event-internal.h @@ -70,6 +70,11 @@ struct event_base { /* Internal use only: Functions that might be missing from <sys/queue.h> */ #ifndef HAVE_TAILQFOREACH +/* These following macros are copied from BSD sys/queue.h + Copyright (c) 1991, 1993, The Regents of the University of California. + All rights reserved. +*/ +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) #define TAILQ_FIRST(head) ((head)->tqh_first) #define TAILQ_END(head) NULL #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) diff --git a/extra/yassl/taocrypt/src/twofish.cpp b/extra/yassl/taocrypt/src/twofish.cpp index 84dd35f9191..85feaa23280 100644 --- a/extra/yassl/taocrypt/src/twofish.cpp +++ b/extra/yassl/taocrypt/src/twofish.cpp @@ -55,6 +55,7 @@ void Twofish::Process(byte* out, const byte* in, word32 sz) in += BLOCK_SIZE; } else if (mode_ == CBC) + { if (dir_ == ENCRYPTION) while (blocks--) { r_[0] ^= *(word32*)in; @@ -82,6 +83,7 @@ void Twofish::Process(byte* out, const byte* in, word32 sz) out += BLOCK_SIZE; in += BLOCK_SIZE; } + } } #endif // DO_TWOFISH_ASM |