From 4251194fe5b9f4d7551c362326e7ca20bc7da99b Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Sat, 3 Sep 2016 16:11:58 -0400 Subject: Worked around the OPTION_GUIDE_EXTERN issue by using a crazy trick involving namespaces Caveats: 1. Because of how this trick works, it is no longer possible to declare an option guide as static, so I had to make a bunch of changes 2. I'm going to want the hardcore C++ guys (i.e. - Vas) to review this with a fine toothed comb --- src/lib/formats/flopimg.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/lib/formats/flopimg.cpp') diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp index e05bd54cf26..9fb487ba971 100644 --- a/src/lib/formats/flopimg.cpp +++ b/src/lib/formats/flopimg.cpp @@ -58,7 +58,7 @@ struct floppy_params static floperr_t floppy_track_unload(floppy_image_legacy *floppy); -OPTION_GUIDE_START(floppy_option_guide_actual) +OPTION_GUIDE_START(floppy_option_guide) OPTION_INT('H', "heads", "Heads") OPTION_INT('T', "tracks", "Tracks") OPTION_INT('S', "sectors", "Sectors") @@ -66,7 +66,6 @@ OPTION_GUIDE_START(floppy_option_guide_actual) OPTION_INT('I', "interleave", "Interleave") OPTION_INT('F', "firstsectorid", "First Sector") OPTION_GUIDE_END -const util::option_guide &floppy_option_guide = floppy_option_guide_actual; static void floppy_close_internal(floppy_image_legacy *floppy, int close_file); -- cgit v1.2.3-70-g09d2