diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-05-05 15:12:14 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-05-05 15:12:14 +0200 |
| commit | d0b32f1af9d039d3bedf27654060beefb6dc3047 (patch) | |
| tree | 53ff08d02dad40afa99fc616d4be21b8ee1bf053 /extra | |
| parent | 02ed15db571d7b6d4be79a5bf0434c1d5c975d6f (diff) | |
| parent | 1f6a936ddc46f9bf035277124ea6be0774038ca4 (diff) | |
| download | mariadb-git-d0b32f1af9d039d3bedf27654060beefb6dc3047.tar.gz | |
Automerge mariadb 5.1 -> mariadb 5.2
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libevent/event-internal.h | 1 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/algebra.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/extra/libevent/event-internal.h b/extra/libevent/event-internal.h index 9dd0c4d7632..c24c784d866 100644 --- a/extra/libevent/event-internal.h +++ b/extra/libevent/event-internal.h @@ -74,7 +74,6 @@ struct event_base { 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/algebra.cpp b/extra/yassl/taocrypt/src/algebra.cpp index c221ce3d6cb..6e402da0117 100644 --- a/extra/yassl/taocrypt/src/algebra.cpp +++ b/extra/yassl/taocrypt/src/algebra.cpp @@ -18,7 +18,6 @@ /* based on Wei Dai's algebra.cpp from CryptoPP */ #undef NDEBUG -#define DEBUG // GCC 4.0 bug if NDEBUG and Optimize > 1 #include "runtime.hpp" #include "algebra.hpp" |