Merge pull request #4830 from 86Box/tc1995

Fix compile.

src/video/vid_ati28800.c

@@ -38,9 +38,9 @@
 
 #define VGAWONDERXL               1
 #define VGAWONDERXLPLUS           2
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 #    define VGAWONDERXL24         3
-#endif
+#endif /* USE_XL24 */
 
 #define BIOS_ATIKOR_PATH         "roms/video/ati28800/atikorvga.bin"
 #define BIOS_ATIKOR_4620P_PATH_L "roms/machines/spc4620p/31005h.u8"
@@ -53,10 +53,10 @@
 #define BIOS_VGAXL_EVEN_PATH     "roms/video/ati28800/xleven.bin"
 #define BIOS_VGAXL_ODD_PATH      "roms/video/ati28800/xlodd.bin"
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 #    define BIOS_XL24_EVEN_PATH "roms/video/ati28800/112-14318-102.bin"
 #    define BIOS_XL24_ODD_PATH  "roms/video/ati28800/112-14319-102.bin"
-#endif
+#endif /* USE_XL24 */
 
 #define BIOS_ROM_PATH            "roms/video/ati28800/bios.bin"
 #define BIOS_VGAXL_ROM_PATH      "roms/video/ati28800/ATI_VGAWonder_XL.bin"
@@ -621,7 +621,7 @@ ati28800_init(const device_t *info)
             ati28800->memory = 1024;
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
         case VGAWONDERXL24:
             ati28800->id = 6;
             rom_init_interleaved(&ati28800->bios_rom,
@@ -630,7 +630,7 @@ ati28800_init(const device_t *info)
                                  0xc0000, 0x10000, 0xffff,
                                  0, MEM_MAPPING_EXTERNAL);
             break;
-#endif
+#endif /* USE_XL24 */
 
         default:
             ati28800->id = 5;
@@ -669,11 +669,11 @@ ati28800_init(const device_t *info)
             ati_eeprom_load(&ati28800->eeprom, "ati28800_wonder1024d_xl_plus.nvr", 0);
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
         case VGAWONDERXL24:
             ati_eeprom_load(&ati28800->eeprom, "ati28800xl24.nvr", 0);
             break;
-#endif
+#endif /* USE_XL24 */
 
         default:
             ati_eeprom_load(&ati28800->eeprom, "ati28800.nvr", 0);
@@ -707,13 +707,13 @@ ati28800_wonder1024d_xl_plus_available(void)
     return (rom_present(BIOS_VGAXL_PLUS_ROM_PATH));
 }
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 static int
 ati28800_wonderxl24_available(void)
 {
     return (rom_present(BIOS_XL24_EVEN_PATH) && rom_present(BIOS_XL24_ODD_PATH));
 }
-#endif
+#endif /* USE_XL24 */
 
 static void
 ati28800_close(void *priv)
@@ -771,7 +771,7 @@ static const device_config_t ati28800_config[] = {
     }
 };
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 static const device_config_t ati28800_wonderxl_config[] = {
     {
         .name = "memory",
@@ -800,7 +800,7 @@ static const device_config_t ati28800_wonderxl_config[] = {
         .type = CONFIG_END
     }
 };
-#endif
+#endif /* USE_XL24 */
 // clang-format on
 
 const device_t ati28800_device = {
@@ -887,7 +887,7 @@ const device_t ati28800_wonder1024d_xl_plus_device = {
     .config        = NULL
 };
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 const device_t ati28800_wonderxl24_device = {
     .name          = "ATI-28800 (VGA Wonder XL24)",
     .internal_name = "ati28800w",
@@ -901,4 +901,4 @@ const device_t ati28800_wonderxl24_device = {
     .force_redraw  = ati28800_force_redraw,
     .config        = ati28800_wonderxl_config
 };
-#endif
+#endif /* USE_XL24 */