mismatched include guard comments (nw)

src/mame/includes/3do.h

@@ -195,4 +195,4 @@ private:
 /*----------- defined in machine/3do.c -----------*/
 
 
-#endif /* _3DO_H_ */
+#endif // MAME_INCLUDES_3DO_H

src/mame/includes/a2600.h

@@ -92,6 +92,4 @@ protected:
 };
 
 
-#endif /* MAME_INCLUDES_A2600H */
-
-
+#endif // MAME_INCLUDES_A2600_H

src/mame/includes/ac1.h

@@ -47,4 +47,4 @@ private:
 /*----------- defined in video/ac1.c -----------*/
 extern const gfx_layout ac1_charlayout;
 
-#endif /* AC1_h_ */
+#endif // MAME_INCLUDES_AC1_H

src/mame/includes/aim65.h

@@ -93,4 +93,4 @@ protected:
 };
 
 
-#endif /* AIM65_H_ */
+#endif // MAME_INCLUDES_AIM65_H

src/mame/includes/amstrad.h

@@ -336,4 +336,4 @@ protected:
 SLOT_INTERFACE_EXTERN(cpc_exp_cards);
 SLOT_INTERFACE_EXTERN(cpcplus_exp_cards);
 
-#endif /* AMSTRAD_H_ */
+#endif // MAME_INCLUDES_AMSTRAD_H

src/mame/includes/apple2e.h

@@ -11,4 +11,4 @@
 
 INPUT_PORTS_EXTERN( apple2ep );
 
-#endif /* APPLE2E_H_ */
+#endif // MAME_INCLUDES_APPLE2E_H

src/mame/includes/apple2gs.h

@@ -272,4 +272,4 @@ public:
 	void apple2gsr1(machine_config &config);
 };
 
-#endif /* APPLE2GS_H_ */
+#endif // MAME_INCLUDES_APPLE2GS_H

src/mame/includes/apple3.h

@@ -169,4 +169,4 @@ private:
 	int m_smoothscr;
 };
 
-#endif /* APPLE3_H_ */
+#endif // MAME_INCLUDES_APPLE3_H

src/mame/includes/archimds.h

@@ -197,4 +197,4 @@ private:
 #define VIDC_VCSR       0xb8
 #define VIDC_VCER       0xbc
 
-#endif  // _ARCHIMEDES_H_
+#endif // MAME_INCLUDES_ARCHIMEDES_H

src/mame/includes/atari400.h

@@ -52,4 +52,4 @@ protected:
 	optional_ioport m_fake;
 };
 
-#endif /* ATARI_H */
+#endif // MAME_INCLUDES_ATARI_H

src/mame/includes/bebox.h

@@ -133,4 +133,4 @@ protected:
 uint32_t scsi53c810_pci_read(device_t *busdevice, device_t *device, int function, int offset, uint32_t mem_mask);
 void scsi53c810_pci_write(device_t *busdevice, device_t *device, int function, int offset, uint32_t data, uint32_t mem_mask);
 
-#endif /* BEBOX_H_ */
+#endif // MAME_INCLUDES_BEBOX_H

src/mame/includes/bk.h

@@ -51,4 +51,4 @@ public:
 	void bk0010fd(machine_config &config);
 };
 
-#endif /* BK_H_ */
+#endif // MAME_INCLUDES_BK_H

src/mame/includes/bwidow.h

@@ -38,4 +38,4 @@ public:
 	void gravitar_audio(machine_config &config);
 };
 
-#endif /* BWIDOW_H_ */
+#endif // MAME_INCLUDES_BWIDOW_H

src/mame/includes/cdi.h

@@ -140,4 +140,4 @@ public:
 
 #define ENABLE_UART_PRINTING (0)
 
-#endif // _INCLUDES_CDI_H_
+#endif // MAME_INCLUDES_CDI_H

src/mame/includes/channelf.h

@@ -55,4 +55,4 @@ public:
 	void channlf2(machine_config &config);
 };
 
-#endif /* CHANNELF_H_ */
+#endif // MAME_INCLUDES_CHANNELF_H

src/mame/includes/comquest.h

@@ -30,4 +30,4 @@ public:
 	void comquest(machine_config &config);
 };
 
-#endif /* COMQUEST_H_ */
+#endif // MAME_INCLUDES_COMQUEST_H

src/mame/includes/crvision.h

@@ -113,4 +113,4 @@ protected:
 	virtual void machine_start() override;
 };
 
-#endif // __CRVISION__
+#endif // MAME_INCLUDES_CRVISION_H

src/mame/includes/cxhumax.h

@@ -280,4 +280,4 @@ public:
 #define DRM_BCKGND_REG                  3
 #define DRM_OSD_PTR_REG                 32
 
-#endif /* CXHUMAX_H_ */
+#endif // MAME_INCLUDES_CXHUMAX_H

src/mame/includes/dai.h

@@ -79,4 +79,4 @@ protected:
 extern const unsigned char dai_palette[16*3];
 
 
-#endif /* DAI_H_ */
+#endif // MAME_INCLUDES_DAI_H

src/mame/includes/dgn_beta.h

@@ -238,4 +238,4 @@ private:
 	void execute_beta_dat_log(int ref, const std::vector<std::string> &params);
 };
 
-#endif /* DGN_BETA_H_ */
+#endif // MAME_INCLUDES_DGN_BETA_H

src/mame/includes/electron.h

@@ -123,4 +123,4 @@ protected:
 };
 
 
-#endif /* ELECTRON_H_ */
+#endif // MAME_INCLUDES_ELECTRON_H

src/mame/includes/esripsys.h

@@ -129,4 +129,4 @@ public:
 	void esripsys(machine_config &config);
 };
 
-#endif // _ESRIPSYS_H_
+#endif // MAME_INCLUDES_ESRIPSYS_H

src/mame/includes/fidelbase.h

@@ -85,4 +85,4 @@ protected:
 INPUT_PORTS_EXTERN( fidel_cb_buttons );
 INPUT_PORTS_EXTERN( fidel_cb_magnets );
 
-#endif // DRIVERS_FIDELBASE_H
+#endif // MAME_INCLUDES_FIDELBASE_H

src/mame/includes/galaxy.h

@@ -57,4 +57,4 @@ protected:
 };
 
 
-#endif /* GALAXY_H_ */
+#endif // MAME_INCLUDES_GALAXY_H

src/mame/includes/galeb.h

@@ -52,4 +52,4 @@ private:
 
 extern const gfx_layout galeb_charlayout;
 
-#endif /* GALEB_H_ */
+#endif // MAME_INCLUDES_GALEB_H

src/mame/includes/gamecom.h

@@ -298,4 +298,4 @@ private:
 	required_ioport_array<13> m_io_grid;
 };
 
-#endif /* GAMECOM_H_ */
+#endif // MAME_INCLUDES_GAMECOM_H

src/mame/includes/gb.h

@@ -152,4 +152,4 @@ public:
 
 
 
-#endif /* GB_H_ */
+#endif // MAME_INCLUDES_GB_H

src/mame/includes/hp9845.h

@@ -152,4 +152,4 @@ protected:
 	bool m_prt_irl;
 };
 
-#endif /* _HP9845_H_ */
+#endif // MAME_INCLUDES_HP9845_H

src/mame/includes/imds2.h

@@ -148,4 +148,4 @@ class imds2_state : public driver_device
 	uint8_t m_device_status_byte;
 };
 
-#endif /* _IMDS2_H_ */
+#endif // MAME_INCLUDES_IMDS2_H

src/mame/includes/kim1.h

@@ -65,4 +65,4 @@ protected:
 	required_ioport m_special;
 };
 
-#endif /* KIM1_H */
+#endif // MAME_INCLUDES_KIM1_H

src/mame/includes/kramermc.h

@@ -39,4 +39,4 @@ public:
 extern const gfx_layout kramermc_charlayout;
 
 
-#endif /* KRAMERMC_h_ */
+#endif // MAME_INCLUDES_KRAMERMC_H

src/mame/includes/lviv.h

@@ -68,4 +68,4 @@ public:
 extern const unsigned char lviv_palette[8*3];
 
 
-#endif /* MAME_INCLUDES_LVIV_H */
+#endif // MAME_INCLUDES_LVIV_H

src/mame/includes/lynx.h

@@ -293,4 +293,4 @@ protected:
 #define SCB_STRETCH 0x0F    //  L H H/V Size Adder
 #define SCB_TILT        0x11    //  L,H H Position Adder
 
-#endif /* LYNX_H_ */
+#endif // MAME_INCLUDES_LYNX_H

src/mame/includes/mac.h

@@ -556,4 +556,4 @@ public:
 	offs_t mac_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer &params);
 };
 
-#endif /* MAC_H_ */
+#endif // MAME_INCLUDES_MAC_H

src/mame/includes/macpci.h

@@ -161,4 +161,4 @@ public:
 	void mac_driver_init(model_t model);
 };
 
-#endif /* PCIMAC_H_ */
+#endif // MAME_INCLUDES_MACPCI_H

src/mame/includes/mario.h

@@ -146,4 +146,4 @@ public:
 	void mario_audio(machine_config &config);
 };
 
-#endif /*MARIO_H_*/
+#endif // MAME_INCLUDES_MARIO_H

src/mame/includes/microtan.h

@@ -101,4 +101,4 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 
-#endif /* MICROTAN_H_ */
+#endif // MAME_INCLUDES_MICROTAN_H

src/mame/includes/mikro80.h

@@ -84,4 +84,4 @@ protected:
 	required_device<cpu_device> m_maincpu;
 };
 
-#endif /* UT88_H_ */
+#endif // MAME_INCLUDES_MIKRO80_H

src/mame/includes/msx.h

@@ -520,4 +520,4 @@ private:
 };
 
 
-#endif /* __MSX_H__ */
+#endif // MAME_INCLUDES_MSX_H

src/mame/includes/mtx.h

@@ -110,4 +110,4 @@ public:
 	void mtx512(machine_config &config);
 };
 
-#endif /* __MTX_H__ */
+#endif // MAME_INCLUDES_MTX_H

src/mame/includes/nc.h

@@ -150,5 +150,4 @@ public: // HACK FOR MC6845
 };
 
 
-
-#endif /* NC_H_ */
+#endif // MAME_INCLUDES_NC_H

src/mame/includes/novagbase.h

@@ -80,4 +80,4 @@ protected:
 INPUT_PORTS_EXTERN( novag_cb_buttons );
 INPUT_PORTS_EXTERN( novag_cb_magnets );
 
-#endif // DRIVERS_NOVAGBASE_H
+#endif // MAME_INCLUDES_NOVAGBASE_H

src/mame/includes/pc1251.h

@@ -64,4 +64,4 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 
-#endif /* PC1251_H_ */
+#endif // MAME_INCLUDES_PC1251_H

src/mame/includes/pc1350.h

@@ -58,4 +58,4 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 
-#endif /* PC1350_H_ */
+#endif // MAME_INCLUDES_PC1350_H

src/mame/includes/pc1401.h

@@ -59,4 +59,4 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 
-#endif /* PC1401_H_ */
+#endif // MAME_INCLUDES_PC1401_H

src/mame/includes/pc1403.h

@@ -64,4 +64,4 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 
-#endif /* PC1403_H_ */
+#endif // MAME_INCLUDES_PC1403_H

src/mame/includes/pc4.h

@@ -74,4 +74,4 @@ protected:
 	ioport_port *io_port[8];
 };
 
-#endif  // _PC4_H_
+#endif // MAME_INCLUDES_PC4_H

src/mame/includes/pce.h

@@ -82,4 +82,4 @@ public:
 	void sgx(machine_config &config);
 };
 
-#endif /* PCE_H_ */
+#endif // MAME_INCLUDES_PCE_H

src/mame/includes/pcw.h

@@ -145,4 +145,4 @@ public:
 	void pcw9512(machine_config &config);
 };
 
-#endif /* PCW_H_ */
+#endif // MAME_INCLUDES_PCW_H

src/mame/includes/pcw16.h

@@ -144,4 +144,4 @@ public:
 	void pcw16(machine_config &config);
 };
 
-#endif /* PCW16_H_ */
+#endif // MAME_INCLUDES_PCW16_H

src/mame/includes/pdp1.h

@@ -332,4 +332,5 @@ private:
 	required_ioport m_lightx;
 	required_ioport m_lighty;
 };
-#endif /* PDP1_H_ */
+
+#endif // MAME_INCLUDES_PDP1_H

src/mame/includes/pes.h

@@ -52,4 +52,4 @@ public:
 };
 
 
-#endif  // _PES_H_
+#endif // MAME_INCLUDES_PES_H

src/mame/includes/pmd85.h

@@ -159,4 +159,4 @@ protected:
 };
 
 
-#endif /* PMD85_H_ */
+#endif // MAME_INCLUDES_PMD85_H

src/mame/includes/pocketc.h

@@ -24,4 +24,4 @@ public:
 	void pocketc(machine_config &config);
 };
 
-#endif /* POCKETC_H_ */
+#endif // MAME_INCLUDES_POCKETC_H

src/mame/includes/poly88.h

@@ -84,4 +84,4 @@ protected:
 	int m_cas_tx;
 };
 
-#endif /* POLY88_H_ */
+#endif // MAME_INCLUDES_POLY88_H

src/mame/includes/psion.h

@@ -110,4 +110,4 @@ public:
 	void psion1(machine_config &config);
 };
 
-#endif  // _PSION_H_
+#endif // MAME_INCLUDES_PSION_H

src/mame/includes/radio86.h

@@ -134,4 +134,4 @@ public:
 INPUT_PORTS_EXTERN( radio86 );
 INPUT_PORTS_EXTERN( ms7007 );
 
-#endif /* radio86_H_ */
+#endif // MAME_INCLUDES_RADIO86_H

src/mame/includes/s11.h

@@ -122,4 +122,4 @@ private:
 	bool m_irq_active;
 };
 
-#endif /* S11_H_ */
+#endif // MAME_INCLUDES_S11_H

src/mame/includes/s11a.h

@@ -30,4 +30,4 @@ private:
 
 };
 
-#endif /* S11A_H_ */
+#endif // MAME_INCLUDES_S11A_H

src/mame/includes/s11b.h

@@ -44,4 +44,4 @@ private:
 
 };
 
-#endif /* S11B_H_ */
+#endif // MAME_INCLUDES_S11B_H

src/mame/includes/s11c.h

@@ -30,4 +30,4 @@ private:
 };
 
 
-#endif /* S11C_H_ */
+#endif // MAME_INCLUDES_S11C_H

src/mame/includes/snes.h

@@ -462,4 +462,4 @@ enum
 	HAS_UNK
 };
 
-#endif /* _SNES_H_ */
+#endif // MAME_INCLUDES_SNES_H

src/mame/includes/sorcerer.h

@@ -111,4 +111,4 @@ private:
 	required_ioport_array<16> m_iop_x;
 };
 
-#endif /* SORCERER_H_ */
+#endif // MAME_INCLUDES_SORCERER_H

src/mame/includes/specpls3.h

@@ -11,4 +11,4 @@
 
 INPUT_PORTS_EXTERN( spec_plus );
 
-#endif /* __SPECPLS3_H__ */
+#endif // MAME_INCLUDES_SPECPLS3_H

src/mame/includes/ssystem3.h

@@ -82,4 +82,4 @@ private:
 };
 
 
-#endif /* SSYSTEM3_H_ */
+#endif // MAME_INCLUDES_SSYSTEM3_H

src/mame/includes/svision.h

@@ -95,4 +95,4 @@ protected:
 	memory_bank *m_bank2;
 };
 
-#endif /* SVISION_H_ */
+#endif // MAME_INCLUDES_SVISION_H

src/mame/includes/ti89.h

@@ -92,4 +92,4 @@ public:
 	void ti89t(machine_config &config);
 };
 
-#endif // TI89_H_
+#endif // MAME_INCLUDES_TI89_H

src/mame/includes/timex.h

@@ -30,5 +30,4 @@ enum
 };
 
 
-
-#endif /* __TIMEX_H__ */
+#endif // MAME_INCLUDES_TIMEX_H

src/mame/includes/tx0.h

@@ -327,4 +327,4 @@ enum
 };
 
 
-#endif /* TX0_H_ */
+#endif // MAME_INCLUDES_TX0_H

src/mame/includes/ut88.h

@@ -96,4 +96,4 @@ private:
 extern const gfx_layout ut88_charlayout;
 
 
-#endif /* UT88_H_ */
+#endif // MAME_INCLUDES_UT88_H

src/mame/includes/vc4000.h

@@ -163,4 +163,4 @@ protected:
 	inline void vc4000_draw_grid(uint8_t *collision);
 };
 
-#endif /* VC4000_H_ */
+#endif // MAME_INCLUDES_VC4000_H

src/mame/includes/vectrex.h

@@ -149,4 +149,4 @@ protected:
 	void vectrex_add_point_stereo(int x, int y, rgb_t color, int intensity);
 };
 
-#endif /* VECTREX_H_ */
+#endif // MAME_INCLUDES_VECTREX_H

src/mame/includes/wpc_dot.h

@@ -81,4 +81,4 @@ private:
 	emu_timer* m_irq_timer;
 };
 
-#endif /* WPC_DOT_H_ */
+#endif // MAME_INCLUDES_WPC_DOT_H

src/mame/includes/wpc_flip1.h

@@ -21,4 +21,4 @@ public:
 	void wpc_flip1(machine_config &config);
 };
 
-#endif /* WPC_FLIP1_H_ */
+#endif // MAME_INCLUDES_WPC_FLIP1_H

src/mame/includes/wpc_flip2.h

@@ -21,4 +21,4 @@ public:
 	void wpc_flip2(machine_config &config);
 };
 
-#endif /* WPC_FLIP2_H_ */
+#endif // MAME_INCLUDES_WPC_FLIP2_H

src/mame/includes/wswan.h

@@ -102,4 +102,4 @@ protected:
 };
 
 
-#endif /* WSWAN_H_ */
+#endif // MAME_INCLUDES_WSWAN_H