diff options
| author | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
| commit | 6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83 (patch) | |
| tree | 7084123a00378c00f7a67da32f9ffe811f8676e3 /mysys | |
| parent | 3783a74dcd1447579dfa4d876a58a5842b03c797 (diff) | |
| parent | 129bc589e18944c7628e8142067605c4f66c4539 (diff) | |
| download | mariadb-git-6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83.tar.gz | |
Post-merge fix.
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_crc32.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c index 5514b01ede2..db1beb58263 100644 --- a/mysys/my_crc32.c +++ b/mysys/my_crc32.c @@ -17,20 +17,7 @@ #include "mysys_priv.h" #ifndef HAVE_COMPRESS - -/* minimal set of defines for using crc32() from zlib codebase */ -#define _ZLIB_H -#define ZEXPORT -#define Z_NULL 0 -#define OF(args) args #undef DYNAMIC_CRC_TABLE -typedef uchar Byte; -typedef uchar Bytef; -typedef uint uInt; -typedef ulong uLong; -typedef ulong uLongf; - #include "../zlib/crc32.c" - #endif |