diff options
-rw-r--r-- | vespalib/src/vespa/vespalib/util/stringfmt.h | 7 | ||||
-rw-r--r-- | vespalog/src/vespa/log/log.h | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/vespalib/src/vespa/vespalib/util/stringfmt.h b/vespalib/src/vespa/vespalib/util/stringfmt.h index df23ad7c20a..e9ec1c433bb 100644 --- a/vespalib/src/vespa/vespalib/util/stringfmt.h +++ b/vespalib/src/vespa/vespalib/util/stringfmt.h @@ -3,12 +3,7 @@ #include <vespa/vespalib/stllike/string.h> #include <cstdarg> - -#ifndef PRId64 - #define PRId64 "ld" - #define PRIu64 "lu" - #define PRIx64 "lx" -#endif +#include <cinttypes> namespace vespalib { diff --git a/vespalog/src/vespa/log/log.h b/vespalog/src/vespa/log/log.h index 4bb13f7d791..ba2408240f3 100644 --- a/vespalog/src/vespa/log/log.h +++ b/vespalog/src/vespa/log/log.h @@ -7,6 +7,7 @@ #include <new> // for placement new #include <cstdlib> // for malloc #include <cstring> // for memset +#include <cinttypes> /** * If this macro is defined, the regular LOG calls will go through the @@ -287,9 +288,3 @@ extern void log_abort(const char *message, #else #define LOG_ASSERT(expr) #endif // #ifndef NDEBUG - -#ifndef PRId64 - #define PRId64 "ld" - #define PRIu64 "lu" - #define PRIx64 "lx" -#endif |