aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-12-11 11:42:58 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-12-11 11:42:58 +0000
commitcb674a9f230d1a8903f2e01d021f4f28e626feaa (patch)
treea26a6063d91af07ecee09546e78aa181eda9b6ec
parente044b31856ac35b2fe73b783fdd9c8e520434c12 (diff)
downloadxen-cb674a9f230d1a8903f2e01d021f4f28e626feaa.tar.gz
xen-cb674a9f230d1a8903f2e01d021f4f28e626feaa.tar.bz2
xen-cb674a9f230d1a8903f2e01d021f4f28e626feaa.zip
bitkeeper revision 1.1159.187.61 (41badd42WPbpyTHpQn9bVGYapDfdOQ)
Type decl cleanups from Charles Coffing.
-rw-r--r--tools/libxc/xc.h17
-rw-r--r--tools/libxc/xc_linux_save.c7
2 files changed, 13 insertions, 11 deletions
diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h
index 18665e9178..30ac7c5c99 100644
--- a/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@ -9,14 +9,15 @@
#ifndef __XC_H__
#define __XC_H__
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-typedef unsigned long long u64;
-typedef signed char s8;
-typedef signed short s16;
-typedef signed long s32;
-typedef signed long long s64;
+#include <stdint.h>
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
#include <xen/xen.h>
#include <xen/dom0_ops.h>
diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c
index 9ff85a241b..6d877c84f0 100644
--- a/tools/libxc/xc_linux_save.c
+++ b/tools/libxc/xc_linux_save.c
@@ -6,6 +6,7 @@
* Copyright (c) 2003, K A Fraser.
*/
+#include <inttypes.h>
#include <sys/time.h>
#include "xc_private.h"
#include <xen/linux/suspend.h>
@@ -245,7 +246,7 @@ static int print_stats( int xc_handle, u32 domid,
if ( print )
printf("delta %lldms, dom0 %d%%, target %d%%, sent %dMb/s, "
- "dirtied %dMb/s %ld pages\n",
+ "dirtied %dMb/s %" PRId32 " pages\n",
wall_delta,
(int)((d0_cpu_delta*100)/wall_delta),
(int)((d1_cpu_delta*100)/wall_delta),
@@ -307,8 +308,8 @@ static int analysis_phase( int xc_handle, u32 domid,
DOM0_SHADOW_CONTROL_OP_PEEK,
NULL, 0, &stats);
- printf("now= %lld faults= %ld dirty= %ld dirty_net= %ld "
- "dirty_block= %ld\n",
+ printf("now= %lld faults= %" PRId32 " dirty= %" PRId32
+ " dirty_net= %" PRId32 " dirty_block= %" PRId32"\n",
((now-start)+500)/1000,
stats.fault_count, stats.dirty_count,
stats.dirty_net_count, stats.dirty_block_count);