diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
| commit | 28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch) | |
| tree | 86c9df8c3fb6d4ebd99d431697c84f06ef242989 /storage/innobase/include/univ.i | |
| parent | 38665893087e20c3ad65d5b0e227a75185a4865e (diff) | |
| parent | f1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff) | |
| download | mariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/innobase/include/univ.i')
| -rw-r--r-- | storage/innobase/include/univ.i | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 10eb83289da..1d2e0f37dbe 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -106,7 +106,6 @@ support cross-platform development and expose comonly used SQL names. */ #endif #include <stdint.h> -#define __STDC_FORMAT_MACROS /* Enable C99 printf format macros */ #include <inttypes.h> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -454,6 +453,7 @@ typedef ssize_t lint; # define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" +# define TIMETPF "%ld" #elif defined __APPLE__ /* Apple prefers to call the 64-bit types 'long long' in both 32-bit and 64-bit environments. */ @@ -461,12 +461,14 @@ in both 32-bit and 64-bit environments. */ # define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" +# define TIMETPF "%" PRIdFAST32 #else /* Use the integer types and formatting strings defined in the C99 standard. */ # define UINT32PF "%" PRIu32 # define INT64PF "%" PRId64 # define UINT64scan PRIu64 # define UINT64PFx "%016" PRIx64 +# define TIMETPF "%" PRIdFAST32 #endif #ifdef UNIV_INNOCHECKSUM |