diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-04 17:13:33 +1000 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-04 12:06:37 +0300 |
| commit | 7f5a3cd2532716a7c8d8308d8afc2dcb3a856ba3 (patch) | |
| tree | 686625ce7e8da1d090ce76e8dbce72aad8e4f204 /storage | |
| parent | 7d7bdd4aaabb88ee13e21644d078c7dfb7cf41ac (diff) | |
| download | mariadb-git-7f5a3cd2532716a7c8d8308d8afc2dcb3a856ba3.tar.gz | |
MDEV-28231: innodb: format string warning on aix UINT64PFx (ib_id_t)
ib_id_t is a uint64. On AIX this isn't a long long unsigned and to
prevent the compile warnings and potential wrong type, the UINT64PFx
defination is corrected.
As INT64PF is unused (last use, xtradb in 10.2), it is removed to
remove the confusion that INT64PF and UINT64PFx would be different
types otherwise.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/univ.i | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index cb18caa0f28..3c8dfb2ddf6 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -400,22 +400,19 @@ typedef ssize_t lint; #ifdef _WIN32 /* Use the integer types and formatting strings defined in Visual Studio. */ # define UINT32PF "%u" -# define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" #elif defined __APPLE__ /* Apple prefers to call the 64-bit types 'long long' in both 32-bit and 64-bit environments. */ # define UINT32PF "%" PRIu32 -# define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" #elif defined _AIX /* Workaround for macros expension trouble */ # define UINT32PF "%u" -# define INT64PF "%lld" # define UINT64scan "lu" -# define UINT64PFx "%016llx" +# define UINT64PFx "%016lx" #else /* Use the integer types and formatting strings defined in the C99 standard. */ # define UINT32PF "%" PRIu32 |