diff options
author | 2021-05-26 14:39:05 -0400 | |
---|---|---|
committer | 2021-05-26 14:39:05 -0400 | |
commit | c7d7b25caa8e87841d8b5c9a30baab89cec7145e (patch) | |
tree | e81a4de2ad69a53a4a0bca12fe984b5f1f535d8b | |
parent | 7026e4ceaa792c647c73bfd904772e86d4e7f176 (diff) |
Better fix for vt_dsk.h header name clash
-rw-r--r-- | scripts/src/tools.lua | 4 | ||||
-rw-r--r-- | src/tools/imgtool/formats/vt_dsk_legacy.cpp (renamed from src/tools/imgtool/formats/vt_dsk.cpp) | 8 | ||||
-rw-r--r-- | src/tools/imgtool/formats/vt_dsk_legacy.h (renamed from src/tools/imgtool/formats/vt_dsk.h) | 10 | ||||
-rw-r--r-- | src/tools/imgtool/modules/vzdos.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 1f1e4215ce8..999ff594407 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -679,8 +679,8 @@ files { MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp", diff --git a/src/tools/imgtool/formats/vt_dsk.cpp b/src/tools/imgtool/formats/vt_dsk_legacy.cpp index a0949ec2575..0d68db7cb33 100644 --- a/src/tools/imgtool/formats/vt_dsk.cpp +++ b/src/tools/imgtool/formats/vt_dsk_legacy.cpp @@ -2,16 +2,16 @@ // copyright-holders:Juergen Buchmueller /********************************************************************* - formats/vt_dsk.c + formats/vt_dsk_legacy.cpp - VTech Laser/VZ disk images + VTech Laser/VZ disk images (legacy support) *********************************************************************/ #include <cstdio> #include <cstring> #include <cassert> -#include "formats/vt_dsk.h" +#include "formats/vt_dsk_legacy.h" #include "formats/basicdsk.h" static FLOPPY_IDENTIFY(vz_identify) @@ -47,7 +47,7 @@ static FLOPPY_CONSTRUCT(vz_construct) } -extern LEGACY_FLOPPY_OPTIONS_START(vz) +LEGACY_FLOPPY_OPTIONS_START(vz) LEGACY_FLOPPY_OPTION(vtech1, "dsk", "Laser/VZ disk image", vz_identify, vz_construct, NULL, HEADS([1]) TRACKS([40]) diff --git a/src/tools/imgtool/formats/vt_dsk.h b/src/tools/imgtool/formats/vt_dsk_legacy.h index a3f9a86b44e..3f31b107f4e 100644 --- a/src/tools/imgtool/formats/vt_dsk.h +++ b/src/tools/imgtool/formats/vt_dsk_legacy.h @@ -2,17 +2,17 @@ // copyright-holders:Juergen Buchmueller /********************************************************************* - formats/vt_dsk.h + formats/vt_dsk_legacy.h - Tandy Color Computer / Dragon disk images + VTech Laser/VZ disk images (legacy support) *********************************************************************/ -#ifndef VT_DSK_H -#define VT_DSK_H +#ifndef VT_DSK_LEGACY_H +#define VT_DSK_LEGACY_H #include "formats/flopimg.h" LEGACY_FLOPPY_OPTIONS_EXTERN(vz); -#endif /* VT_DSK_H */ +#endif /* VT_DSK_LEGACY_H */ diff --git a/src/tools/imgtool/modules/vzdos.cpp b/src/tools/imgtool/modules/vzdos.cpp index 4ccbc801253..135df100119 100644 --- a/src/tools/imgtool/modules/vzdos.cpp +++ b/src/tools/imgtool/modules/vzdos.cpp @@ -14,7 +14,7 @@ #include <cmath> #include "imgtool.h" #include "formats/imageutl.h" -#include "formats/vt_dsk.h" +#include "formats/vt_dsk_legacy.h" #include "iflopimg.h" /* |