--- parted-1.4.20-pre2/libparted/disk_gpt.c.orig	Fri Oct  5 14:43:05 2001
+++ parted-1.4.20-pre2/libparted/disk_gpt.c	Fri Oct  5 14:50:20 2001
@@ -51,8 +51,13 @@
 #  define _(String) (String)
 #endif				/* ENABLE_NLS */
 
-#define MIN_FREESPACE		(150 * 2)	/* 150k */
+#ifdef __LP64__
+#define PU64X "%lx"
+#else
+#define PU64X "%llx"
+#endif
 
+#define MIN_FREESPACE		(150 * 2)	/* 150k */
 
 static int gpt_probe(const PedDevice * dev);
 static PedDisk *gpt_open(PedDevice * dev);
@@ -351,8 +356,8 @@
 	memcpy(uuid, &pte->UniquePartitionGuid, sizeof(uuid_t));
 	uuid_unparse(uuid, uuid_buffer);
 	printf("\tUniquePartitionGuid : %s\n", uuid_buffer);
-	printf("\tStartingLBA : %llx\n", pte->StartingLBA);
-	printf("\tEndingLBA   : %llx\n", pte->EndingLBA);
+	printf("\tStartingLBA : " PU64X "\n", pte->StartingLBA);
+	printf("\tEndingLBA   : " PU64X "\n", pte->EndingLBA);
 	printf("\tAttributes  : ");
 	printf("\tRequiredToFunction: %x",
 	       pte->Attributes.RequiredToFunction);
@@ -370,18 +375,18 @@
 	uuid_t uuid;
 	printf("GUID Partition Table Header\n");
 	PED_ASSERT(gpt != NULL, return);
-	printf("Signature      : 0x%llx\n", gpt->Signature);
+	printf("Signature      : 0x" PU64X "\n", gpt->Signature);
 	printf("Revision       : 0x%x\n", gpt->Revision);
 	printf("HeaderSize     : 0x%x\n", gpt->HeaderSize);
 	printf("HeaderCRC32    : 0x%x\n", gpt->HeaderCRC32);
-	printf("MyLBA          : 0x%llx\n", gpt->MyLBA);
-	printf("AlternateLBA   : 0x%llx\n", gpt->AlternateLBA);
-	printf("FirstUsableLBA : 0x%llx\n", gpt->FirstUsableLBA);
-	printf("LastUsableLBA  : 0x%llx\n", gpt->LastUsableLBA);
+	printf("MyLBA          : 0x" PU64X "\n", gpt->MyLBA);
+	printf("AlternateLBA   : 0x" PU64X "\n", gpt->AlternateLBA);
+	printf("FirstUsableLBA : 0x" PU64X "\n", gpt->FirstUsableLBA);
+	printf("LastUsableLBA  : 0x" PU64X "\n", gpt->LastUsableLBA);
 	memcpy(uuid, &gpt->DiskGUID, sizeof(uuid_t));
 	uuid_unparse(uuid, uuid_buffer);
 	printf("DiskGUID : %s\n", uuid_buffer);
-	printf("PartitionEntryLBA : %llx\n", gpt->PartitionEntryLBA);
+	printf("PartitionEntryLBA : " PU64X "\n", gpt->PartitionEntryLBA);
 	printf("NumberOfPartitionEntries : %x\n",
 	       gpt->NumberOfPartitionEntries);
 	printf("SizeOfPartitionEntry : %x\n", gpt->SizeOfPartitionEntry);
@@ -517,7 +522,7 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
 			_("GUID Partition Table Header Signature is wrong: "
-			  "%llx should be %llx"),
+			  PU64X " should be " PU64X),
 			(*gpt)->Signature, GPT_HEADER_SIGNATURE);
 		goto error_free_gpt;
 	}
@@ -543,7 +548,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			"MyLBA %llx != lba %llx.\n", (*gpt)->MyLBA, lba);
+			"MyLBA " PU64X " != lba " PU64X ".\n", (*gpt)->MyLBA, lba);
 		goto error_free_gpt;
 	}