--- a/tools/libxc/xc.h	2004-12-02 09:25:04.000000000 -0700
+++ b/tools/libxc/xc.h	2004-12-09 12:28:11.346154189 -0700
@@ -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>
--- a/tools/libxc/xc_linux_save.c	2004-12-09 12:49:14.163232557 -0700
+++ b/tools/libxc/xc_linux_save.c	2004-12-09 13:08:42.965728543 -0700
@@ -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>
@@ -243,7 +244,7 @@
 
     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),
@@ -305,8 +306,8 @@
                                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);