[Commits] cbf84a806df: Remove uintmax_t to fix compiler error on Windows.

jan jan.lindstrom at mariadb.com
Tue Aug 1 11:33:29 EEST 2017


revision-id: cbf84a806dfedc95bb5fbefd0a850f98b6dc2bd1 (mariadb-10.1.25-14-gcbf84a806df)
parent(s): 038efcd1850cbc876d884ee7440ae9d265472551
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-01 11:33:13 +0300
message:

Remove uintmax_t to fix compiler error on Windows.

---
 extra/innochecksum.cc           | 10 +++++-----
 storage/innobase/include/univ.i | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 3f449d5b4a4..e258a8c1d08 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -83,9 +83,9 @@ typedef void fil_space_t;
 /* Global variables */
 static bool			verbose;
 static bool			just_count;
-static uintmax_t		start_page;
-static uintmax_t		end_page;
-static uintmax_t		do_page;
+static ulint			start_page;
+static ulint			end_page;
+static ulint			do_page;
 static bool			use_end_page;
 static bool			do_one_page;
 static my_bool do_leaf;
@@ -96,7 +96,7 @@ static ulong physical_page_size;  /* Page size in bytes on disk. */
 static ulong logical_page_size;   /* Page size when uncompressed. */
 ulong srv_page_size;
 /* Current page number (0 based). */
-uintmax_t			cur_page_num;
+ulint			cur_page_num;
 /* Skip the checksum verification. */
 static bool			no_check;
 /* Enabled for strict checksum verification. */
@@ -104,7 +104,7 @@ bool				strict_verify = 0;
 /* Enabled for rewrite checksum. */
 static bool			do_write;
 /* Mismatches count allowed (0 by default). */
-static uintmax_t		allow_mismatches;
+static ulint     		allow_mismatches;
 static bool			page_type_summary;
 static bool			page_type_dump;
 /* Store filename for page-type-dump option. */
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index c558c971d33..aafb84db6f1 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -128,12 +128,6 @@ Sun Studio */
 #include <inttypes.h>
 #endif /* !__WIN__ */
 
-#ifdef UNIV_INNOCHECKSUM
-extern bool 		strict_verify;
-extern FILE* 		log_file;
-extern uintmax_t	cur_page_num;
-#endif /* UNIV_INNOCHECKSUM */
-
 /* Following defines are to enable performance schema
 instrumentation in each of four InnoDB modules if
 HAVE_PSI_INTERFACE is defined. */
@@ -488,6 +482,12 @@ typedef long int		lint;
 typedef unsigned long long int	ullint;
 #endif /* UNIV_HOTBACKUP */
 
+#ifdef UNIV_INNOCHECKSUM
+extern bool 		strict_verify;
+extern FILE* 		log_file;
+extern ulint		cur_page_num;
+#endif /* UNIV_INNOCHECKSUM */
+
 #ifndef __WIN__
 #if SIZEOF_LONG != SIZEOF_VOIDP
 #error "Error: InnoDB's ulint must be of the same size as void*"


More information about the commits mailing list