From b59e0cc56eb6d5f3b6f934722931f6919309ffd2 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 18 Nov 2008 18:22:56 -0800
Subject: [i386] Change [u]int32_t to [unsigned] int, rather than [unsigned]
 long

This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
---
 src/core/debug.c | 4 ++--
 src/core/uuid.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core')

diff --git a/src/core/debug.c b/src/core/debug.c
index 3079cd4c7..500a7ac05 100644
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -106,12 +106,12 @@ int check_region ( void *region, size_t len ) {
 					 virt_to_phys ( region + len ) );
 			}
 			in_corruption = 1;
-			printf ( "--- offset %#lx ", offset );
+			printf ( "--- offset %#x ", offset );
 		} else if ( ( in_corruption != 0 ) &&
 			    ( test == GUARD_SYMBOL ) ) {
 			/* End of corruption */
 			in_corruption = 0;
-			printf ( "to offset %#lx", offset );
+			printf ( "to offset %#x", offset );
 		}
 
 	}
diff --git a/src/core/uuid.c b/src/core/uuid.c
index c6e7f5d54..a3a82c688 100644
--- a/src/core/uuid.c
+++ b/src/core/uuid.c
@@ -36,7 +36,7 @@
 char * uuid_ntoa ( union uuid *uuid ) {
 	static char buf[37]; /* "00000000-0000-0000-0000-000000000000" */
 
-	sprintf ( buf, "%08lx-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
+	sprintf ( buf, "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
 		  be32_to_cpu ( uuid->canonical.a ),
 		  be16_to_cpu ( uuid->canonical.b ),
 		  be16_to_cpu ( uuid->canonical.c ),
-- 
cgit v1.2.3-55-g7522