diff options
| author | Michael Brown | 2008-11-19 03:22:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:15:44 +0100 |
| commit | b59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch) | |
| tree | 0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/core | |
| parent | [libgcc] Make __libgcc architecture-specific (diff) | |
| download | ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip | |
[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.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/debug.c | 4 | ||||
| -rw-r--r-- | src/core/uuid.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 ), |