X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=cbdfa7fd6e2786625a22a7e0ef35f715293ebff1;hp=cedac20fe47dfcbf9d55c510f04d7954bcff4094;hb=380d60b1bd3c5d1a709dca3eeb8e718598fed235;hpb=47e0f2e23aef98a584bf964754ab1e29c2897cfb

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index cedac20f..cbdfa7fd 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -24,6 +24,7 @@
 #include <assert.h>
 #include <glib.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
@@ -153,7 +154,7 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id)
 {
 	int ret;
 
-	ret = (int) g_hash_table_lookup(s->types, id);
+	ret = (int) (long) g_hash_table_lookup(s->types, id);
 	printf_dbg("lookup %p %s %d\n", s, id, ret);
 	return ret;
 }
@@ -925,21 +926,21 @@ postfix_expression:
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "%llu",
+			sscanf(yylval.gs->s, "%" PRIu64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	|	OCTAL_CONSTANT
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "0%llo",
+			sscanf(yylval.gs->s, "0%" PRIo64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	|	HEXADECIMAL_CONSTANT
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "0x%llx",
+			sscanf(yylval.gs->s, "0x%" PRIx64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	|	STRING_LITERAL_START DQUOTE
@@ -1465,21 +1466,21 @@ type_specifier_or_integer_constant:
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "%llu",
+			sscanf(yylval.gs->s, "%" PRIu64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	|	OCTAL_CONSTANT
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "0%llo",
+			sscanf(yylval.gs->s, "0%" PRIo64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	|	HEXADECIMAL_CONSTANT
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-			sscanf(yylval.gs->s, "0x%llx",
+			sscanf(yylval.gs->s, "0x%" PRIx64,
 			       &$$->u.unary_expression.u.unsigned_constant);
 		}
 	;