authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-16 20:24:51-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-16 20:24:51-07:00
logbb806f941c81cca140b7554eac130fd365df871f
tree69b982e47fd49d3a9beec895a1edc60bf4ae422c
parent6793548868749ac7638000182fe9b730179b2b82

use PRIuMAX instead of PRIu64 for mingw

2 files changed, 6 insertions(+), 6 deletions(-)

src/analyze.cpp+4-4
...@@ -396,7 +396,7 @@ TypeTableEntry *get_array_type(CodeGen *g, TypeTableEntry *child_type, uint64_t...@@ -396,7 +396,7 @@ TypeTableEntry *get_array_type(CodeGen *g, TypeTableEntry *child_type, uint64_t
396 entry->zero_bits = (array_size == 0) || child_type->zero_bits;396 entry->zero_bits = (array_size == 0) || child_type->zero_bits;
397397
398 buf_resize(&entry->name, 0);398 buf_resize(&entry->name, 0);
399 buf_appendf(&entry->name, "[%" PRIu64 "]%s", array_size, buf_ptr(&child_type->name));399 buf_appendf(&entry->name, "[%" PRIuMAX "]%s", (uintmax_t)array_size, buf_ptr(&child_type->name));
400400
401 if (!entry->zero_bits) {401 if (!entry->zero_bits) {
402 uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, entry->type_ref);402 uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, entry->type_ref);
...@@ -4158,9 +4158,9 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry...@@ -4158,9 +4158,9 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
4158 uint64_t src_align = get_memcpy_align(g, src_type->data.pointer.child_type);4158 uint64_t src_align = get_memcpy_align(g, src_type->data.pointer.child_type);
4159 if (dest_align != src_align) {4159 if (dest_align != src_align) {
4160 add_node_error(g, dest_node, buf_sprintf(4160 add_node_error(g, dest_node, buf_sprintf(
4161 "misaligned memcpy, '%s' has alignment '%" PRIu64 ", '%s' has alignment %" PRIu64,4161 "misaligned memcpy, '%s' has alignment '%" PRIuMAX ", '%s' has alignment %" PRIuMAX,
4162 buf_ptr(&dest_type->name), dest_align,4162 buf_ptr(&dest_type->name), (uintmax_t)dest_align,
4163 buf_ptr(&src_type->name), src_align));4163 buf_ptr(&src_type->name), (uintmax_t)src_align));
4164 }4164 }
4165 }4165 }
41664166
src/ast_render.cpp+2-2
...@@ -351,7 +351,7 @@ void ast_print(FILE *f, AstNode *node, int indent) {...@@ -351,7 +351,7 @@ void ast_print(FILE *f, AstNode *node, int indent) {
351 NumLit kind = node->data.number_literal.kind;351 NumLit kind = node->data.number_literal.kind;
352 const char *name = node_type_str(node->type);352 const char *name = node_type_str(node->type);
353 if (kind == NumLitUInt) {353 if (kind == NumLitUInt) {
354 fprintf(f, "%s uint %" PRIu64 "\n", name, node->data.number_literal.data.x_uint);354 fprintf(f, "%s uint %" PRIuMAX "\n", name, (uintmax_t)node->data.number_literal.data.x_uint);
355 } else {355 } else {
356 fprintf(f, "%s float %f\n", name, node->data.number_literal.data.x_float);356 fprintf(f, "%s float %f\n", name, node->data.number_literal.data.x_float);
357 }357 }
...@@ -679,7 +679,7 @@ static void render_node(AstRender *ar, AstNode *node) {...@@ -679,7 +679,7 @@ static void render_node(AstRender *ar, AstNode *node) {
679 case NodeTypeNumberLiteral:679 case NodeTypeNumberLiteral:
680 switch (node->data.number_literal.kind) {680 switch (node->data.number_literal.kind) {
681 case NumLitUInt:681 case NumLitUInt:
682 fprintf(ar->f, "%" PRIu64, node->data.number_literal.data.x_uint);682 fprintf(ar->f, "%" PRIuMAX, (uintmax_t)node->data.number_literal.data.x_uint);
683 break;683 break;
684 case NumLitFloat:684 case NumLitFloat:
685 fprintf(ar->f, "%f", node->data.number_literal.data.x_float);685 fprintf(ar->f, "%f", node->data.number_literal.data.x_float);