diff options
author | Jim Meyering <meyering@redhat.com> | 2011-06-28 20:09:46 +0200 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-06-28 23:30:12 +0100 |
commit | 3e38a3c7ae31035d6cf4069d61e8b32d2dbd3ebb (patch) | |
tree | 02f858f178c4228d09b5f462cfa444d43fe7b1b9 | |
parent | 6780483c3c00913e718a6134e12d82665e9ce0a6 (diff) | |
download | hivex-3e38a3c7ae31035d6cf4069d61e8b32d2dbd3ebb.tar.gz hivex-3e38a3c7ae31035d6cf4069d61e8b32d2dbd3ebb.tar.xz hivex-3e38a3c7ae31035d6cf4069d61e8b32d2dbd3ebb.zip |
maint: remove definitions of PRId64 and PRIu64, ...
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>.
-rwxr-xr-x | bootstrap | 1 | ||||
-rwxr-xr-x | generator/generator.ml | 11 |
2 files changed, 3 insertions, 9 deletions
@@ -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) { |