Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 10:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build for Linux people, where gcc claims that it doesn't support I64 for printf. Thanks Usurp on IRC

Browse source 
svn path=/trunk/; revision=23839
This commit is contained in:
Hervé Poussineau 2006-08-31 12:31:34 +00:00
parent ed70ab7f26
commit 8b597b0970
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/base/setup/usetup/partlist.c
View file

@ -1083,7 +1083,7 @@ PrintPartitionData (PPARTLIST List,
USHORT Width; USHORT Width;
USHORT Height; USHORT Height;
ULONGLONG PartSize; LARGE_INTEGER PartSize;
PCHAR Unit; PCHAR Unit;
UCHAR Attribute; UCHAR Attribute;
PCHAR PartType; PCHAR PartType;
@ -1100,25 +1100,25 @@ PrintPartitionData (PPARTLIST List,
#if 0 #if 0
if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */
{ {
PartSize = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30;
Unit = "GB"; Unit = "GB";
} }
else else
#endif #endif
if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */
{ {
PartSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20;
Unit = "MB"; Unit = "MB";
} }
else else
{ {
PartSize = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10;
Unit = "KB"; Unit = "KB";
} }
sprintf (LineBuffer, sprintf (LineBuffer,
" Unpartitioned space %6I64u %s", " Unpartitioned space %6lu %s",
PartSize, PartSize.u.LowPart,
Unit); Unit);
} }
else else
@ -1152,40 +1152,40 @@ PrintPartitionData (PPARTLIST List,
#if 0 #if 0
if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30;
Unit = "GB"; Unit = "GB";
} }
else else
#endif #endif
if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20;
Unit = "MB"; Unit = "MB";
} }
else else
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10;
Unit = "KB"; Unit = "KB";
} }
if (PartType == NULL) if (PartType == NULL)
{ {
sprintf (LineBuffer, sprintf (LineBuffer,
"%c%c Type %-3u %6I64u %s", "%c%c Type %-3u %6lu %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter == 0) ? '-' : ':',
PartEntry->PartInfo[0].PartitionType, PartEntry->PartInfo[0].PartitionType,
PartSize, PartSize.u.LowPart,
Unit); Unit);
} }
else else
{ {
sprintf (LineBuffer, sprintf (LineBuffer,
"%c%c %-24s %6I64u %s", "%c%c %-24s %6lu %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter == 0) ? '-' : ':',
PartType, PartType,
PartSize, PartSize.u.LowPart,
Unit); Unit);
} }
} }