diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 21:48:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 21:50:53 +0200 |
| commit | 17e371fffe3d0a25936e64f8b2f87b9f5d73c0a3 (patch) | |
| tree | 85d5f2815d705c8af3c0178a9e0529753dea031f /extra/innochecksum.cc | |
| parent | 757530b83ca1cc550127311dc6edb47152ba0c6a (diff) | |
| download | mariadb-git-17e371fffe3d0a25936e64f8b2f87b9f5d73c0a3.tar.gz | |
More InnoDB preprocessor cleanup
Remove unnecessary #include.
Remove references to UNIV_MATERIALIZE, UNIV_INLINE_ORIGINAL, UNIV_NONINL
that are never defined.
Diffstat (limited to 'extra/innochecksum.cc')
| -rw-r--r-- | extra/innochecksum.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index e4b81dff34c..0eb2b9aba71 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. - Copyright (c) 2014, 2017, MariaDB Corporation. + Copyright (c) 2014, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,15 +45,7 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */ typedef void fil_space_t; #include "page0size.h" - -#define FLST_BASE_NODE_SIZE (4 + 2 * FIL_ADDR_SIZE) -#define FLST_NODE_SIZE (2 * FIL_ADDR_SIZE) -#define FSEG_PAGE_DATA FIL_PAGE_DATA -#define FSEG_HEADER_SIZE 10 -#define UT_BITS_IN_BYTES(b) (((b) + 7) / 8) - #include "ut0ut.h" -#include "ut0byte.h" #include "mtr0types.h" #include "mach0data.h" #include "fsp0types.h" @@ -72,12 +64,6 @@ typedef void fil_space_t; #include <string.h> -#ifdef UNIV_NONINL -# include "fsp0fsp.ic" -# include "mach0data.ic" -# include "ut0rnd.ic" -#endif - #ifndef PRIuMAX #define PRIuMAX "llu" #endif |