github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-04-26 03:57:11 +00:00
Code Releases Activity

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
committed by Mark Pizzolato
parent b6f3043ecb
commit d87bd32653
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sim_disk.c
View File

@@ -6331,10 +6331,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;
@@ -6626,10 +6626,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;
@@ -6772,7 +6772,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)