[Libguestfs] [PATCH hivex 03/14] maint: remove definitions of PRId64 and PRIu64, ...
From: Jim Meyering <meyering(a)redhat.com>
now that we're using gnulib's inttypes module, which ensures
that we use a conforming <inttypes.h>.
* bootstrap (modules): Add inttypes.
* generator/generator.ml (generate_perl_xs) [PRId64, PRIu64]:
Don't define these symbols. Instead, ...
Include <inttypes.h>.
---
bootstrap | 1 +
generator/generator.ml | 11 ++---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/bootstrap b/bootstrap
index ecaf2c8..e91c8c9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -62,6 +62,7 @@ gitlog-to-changelog
gnu-make
gnumakefile
ignore-value
+inttypes
maintainer-makefile
manywarnings
progname
diff --git a/generator/generator.ml b/generator/generator.ml
index 117781a..8f1f935 100755
--- a/generator/generator.ml
+++ b/generator/generator.ml
@@ -1,6 +1,6 @@
#!/usr/bin/env ocaml
(* hivex
- * Copyright (C) 2009-2010 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -2188,10 +2188,7 @@ and generate_perl_xs () =
#include <string.h>
#include <hivex.h>
-
-#ifndef PRId64
-#define PRId64 \"lld\"
-#endif
+#include <inttypes.h>
static SV *
my_newSVll(long long val) {
@@ -2205,10 +2202,6 @@ my_newSVll(long long val) {
#endif
}
-#ifndef PRIu64
-#define PRIu64 \"llu\"
-#endif
-
#if 0
static SV *
my_newSVull(unsigned long long val) {
--
1.7.6.rc2.302.gc2115