diff options
author | 2016-09-03 16:11:58 -0400 | |
---|---|---|
committer | 2016-09-03 16:11:58 -0400 | |
commit | 4251194fe5b9f4d7551c362326e7ca20bc7da99b (patch) | |
tree | b82bba2120de1fbfd16631b91ba8b479e2ccf9fe /src/tools/imgtool/modules/thomson.cpp | |
parent | be3c18302e117049c0f4c75f719afc3d3d69aa08 (diff) |
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
Diffstat (limited to 'src/tools/imgtool/modules/thomson.cpp')
-rw-r--r-- | src/tools/imgtool/modules/thomson.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/imgtool/modules/thomson.cpp b/src/tools/imgtool/modules/thomson.cpp index 9ae04b0de4e..ecd475add86 100644 --- a/src/tools/imgtool/modules/thomson.cpp +++ b/src/tools/imgtool/modules/thomson.cpp @@ -1519,7 +1519,7 @@ FILTER( thombas128, /************************* driver ***************************/ -static OPTION_GUIDE_START( thom_createimage_optguide ) +OPTION_GUIDE_START( thom_createimage_optguide ) OPTION_INT( 'H', "heads", "Heads" ) OPTION_INT( 'T', "tracks", "Tracks" ) OPTION_ENUM_START( 'D', "density", "Density" ) @@ -1529,7 +1529,7 @@ static OPTION_GUIDE_START( thom_createimage_optguide ) OPTION_STRING( 'N', "name", "Floppy name" ) OPTION_GUIDE_END -static OPTION_GUIDE_START( thom_writefile_optguide ) +OPTION_GUIDE_START( thom_writefile_optguide ) OPTION_ENUM_START( 'T', "ftype", "File type" ) OPTION_ENUM( 0, "auto", "Automatic (by extension)" ) OPTION_ENUM( 1, "B", "Program" ) |