folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DISK: rename CreateVirtualDisk

Browse source 
This fixes issue #52, name conflict when building in MinGW.
This commit is contained in:
Paul Koning 2022-11-29 12:03:10 -05:00
parent 9dea1cecd1
commit 068b0f37b4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sim_disk.c
View file

@ -5670,10 +5670,10 @@ _rand_uuid_gen (uuidaddr);
#endif #endif
static VHDHANDLE static VHDHANDLE
CreateVirtualDisk(const char *szVHDPath, sim_CreateVirtualDisk(const char *szVHDPath,
uint32 SizeInSectors, uint32 SizeInSectors,
uint32 BlockSize, uint32 BlockSize,
t_bool bFixedVHD) t_bool bFixedVHD)
{ {
VHD_Footer Footer; VHD_Footer Footer;
VHD_DynamicDiskHeader Dynamic; VHD_DynamicDiskHeader Dynamic;
@ -5965,10 +5965,10 @@ if ((Status = GetVHDFooter (szParentVHDPath,
NULL, NULL,
0))) 0)))
goto Cleanup_Return; goto Cleanup_Return;
hVHD = CreateVirtualDisk (szVHDPath, hVHD = sim_CreateVirtualDisk (szVHDPath,
(uint32)(NtoHll(ParentFooter.CurrentSize)/BytesPerSector), (uint32)(NtoHll(ParentFooter.CurrentSize)/BytesPerSector),
NtoHl(ParentDynamic.BlockSize), NtoHl(ParentDynamic.BlockSize),
FALSE); FALSE);
if (!hVHD) { if (!hVHD) {
Status = errno; Status = errno;
goto Cleanup_Return; goto Cleanup_Return;
@ -6111,7 +6111,7 @@ return hVHD;
static FILE *sim_vhd_disk_create (const char *szVHDPath, t_offset desiredsize) static FILE *sim_vhd_disk_create (const char *szVHDPath, t_offset desiredsize)
{ {
return (FILE *)CreateVirtualDisk (szVHDPath, (uint32)(desiredsize/512), 0, (sim_switches & SWMASK ('X'))); return (FILE *)sim_CreateVirtualDisk (szVHDPath, (uint32)(desiredsize/512), 0, (sim_switches & SWMASK ('X')));
} }
static FILE *sim_vhd_disk_create_diff (const char *szVHDPath, const char *szParentVHDPath) static FILE *sim_vhd_disk_create_diff (const char *szVHDPath, const char *szParentVHDPath)