From 068b0f37b4460aaac875f015036b36efb097f268 Mon Sep 17 00:00:00 2001 From: Paul Koning Date: Tue, 29 Nov 2022 12:03:10 -0500 Subject: [PATCH] DISK: rename CreateVirtualDisk This fixes issue #52, name conflict when building in MinGW. --- sim_disk.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sim_disk.c b/sim_disk.c index d19cf034..a45ffd0c 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -5670,10 +5670,10 @@ _rand_uuid_gen (uuidaddr); #endif static VHDHANDLE -CreateVirtualDisk(const char *szVHDPath, - uint32 SizeInSectors, - uint32 BlockSize, - t_bool bFixedVHD) +sim_CreateVirtualDisk(const char *szVHDPath, + uint32 SizeInSectors, + uint32 BlockSize, + t_bool bFixedVHD) { VHD_Footer Footer; VHD_DynamicDiskHeader Dynamic; @@ -5965,10 +5965,10 @@ if ((Status = GetVHDFooter (szParentVHDPath, NULL, 0))) goto Cleanup_Return; -hVHD = CreateVirtualDisk (szVHDPath, - (uint32)(NtoHll(ParentFooter.CurrentSize)/BytesPerSector), - NtoHl(ParentDynamic.BlockSize), - FALSE); +hVHD = sim_CreateVirtualDisk (szVHDPath, + (uint32)(NtoHll(ParentFooter.CurrentSize)/BytesPerSector), + NtoHl(ParentDynamic.BlockSize), + FALSE); if (!hVHD) { Status = errno; goto Cleanup_Return; @@ -6111,7 +6111,7 @@ return hVHD; 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)