diff options
| author | 2024-11-27 06:09:34 +1100 | |
|---|---|---|
| committer | 2024-11-27 06:09:34 +1100 | |
| commit | 2cf1afbf7475a5bf327e765cf5cd79d95b918612 (patch) | |
| tree | 404d755dc4841c897d05a052c197de1dce724fda | |
| parent | aea6a32a292603287411998a92dfe7ec985da43d (diff) | |
Demote tautological-compare to a warning again.
clang on Windows x86-64 is getting upset about code that is making no
assumptions about the relative sizes of uint64_t and long.
Also, fixed more #include guards.
46 files changed, 151 insertions, 141 deletions
diff --git a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx index 9679faf8364..82f915354e9 100644 --- a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx +++ b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz +#ifndef MAME_CPU_E132XS_E132XSDRC_OPS_HXX +#define MAME_CPU_E132XS_E132XSDRC_OPS_HXX + +#pragma once #include "e132xs.h" @@ -5207,3 +5211,4 @@ void hyperstone_device::generate_do(drcuml_block &block, compiler_state &compile fatalerror(" "); } +#endif // MAME_CPU_E132XS_E132XSDRC_OPS_HXX diff --git a/src/devices/cpu/i860/i860dec.hxx b/src/devices/cpu/i860/i860dec.hxx index af286b04c4b..39723bbe43a 100644 --- a/src/devices/cpu/i860/i860dec.hxx +++ b/src/devices/cpu/i860/i860dec.hxx @@ -35,6 +35,11 @@ * today also use IEEE FP. * */ +#ifndef MAME_CPU_I860_I860DEC_HXX +#define MAME_CPU_I860_I860DEC_HXX + +#pragma once + #include "i860.h" #include <cmath> @@ -4670,3 +4675,5 @@ void debugger (i860s *cpustate) } #endif + +#endif // MAME_CPU_I860_I860DEC_HXX diff --git a/src/devices/cpu/sh/sh_dasm.h b/src/devices/cpu/sh/sh_dasm.h index 820dce618a1..2b29187ee73 100644 --- a/src/devices/cpu/sh/sh_dasm.h +++ b/src/devices/cpu/sh/sh_dasm.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Juergen Buchmueller, R. Belmont -#ifndef MAME_CPU_SH_SH_SHDASM_H -#define MAME_CPU_SH_SH_SHDASM_H +#ifndef MAME_CPU_SH_SH_DASM_H +#define MAME_CPU_SH_SH_DASM_H #pragma once @@ -42,4 +42,4 @@ private: bool m_is_sh34; }; -#endif // MAME_CPU_SH_SH_SHDASM_H +#endif // MAME_CPU_SH_SH_DASM_H diff --git a/src/devices/cpu/sparc/sparcdasm.h b/src/devices/cpu/sparc/sparcdasm.h index 78c5fe58f42..b92a2c283a3 100644 --- a/src/devices/cpu/sparc/sparcdasm.h +++ b/src/devices/cpu/sparc/sparcdasm.h @@ -4,8 +4,8 @@ SPARC disassembler */ -#ifndef MAME_CPU_SPARC_SPARC_DASM_H -#define MAME_CPU_SPARC_SPARC_DASM_H +#ifndef MAME_CPU_SPARC_SPARCDASM_H +#define MAME_CPU_SPARC_SPARCDASM_H #pragma once @@ -255,4 +255,4 @@ private: vis_op_desc_map m_vis_op_desc; }; -#endif // MAME_CPU_SPARC_SPARC_DASM_H +#endif // MAME_CPU_SPARC_SPARCDASM_H diff --git a/src/devices/cpu/spc700/spc700ds.h b/src/devices/cpu/spc700/spc700ds.h index 98a7f249e27..9306b23b740 100644 --- a/src/devices/cpu/spc700/spc700ds.h +++ b/src/devices/cpu/spc700/spc700ds.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Karl Stenerud -#ifndef MAME_CPU_SPC800_SPC700DS_H -#define MAME_CPU_SPC800_SPC700DS_H +#ifndef MAME_CPU_SPC700_SPC700DS_H +#define MAME_CPU_SPC700_SPC700DS_H #pragma once @@ -63,4 +63,4 @@ private: }; -#endif // MAME_CPU_SPC800_SPC700DS_H +#endif // MAME_CPU_SPC700_SPC700DS_H diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 0f5f0b01f7d..f33a2612387 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -2,8 +2,8 @@ // copyright-holders:Nathan Woods, Miodrag Milanovic /* flopdrv provides simple emulation of a disc drive */ -#ifndef MAME_IMAGEDV_FLOPDRV_H -#define MAME_IMAGEDV_FLOPDRV_H +#ifndef MAME_IMAGEDEV_FLOPDRV_H +#define MAME_IMAGEDEV_FLOPDRV_H #pragma once @@ -224,4 +224,4 @@ protected: char m_extension_list[256]; }; -#endif // MAME_IMAGEDV_FLOPDRV_H +#endif // MAME_IMAGEDEV_FLOPDRV_H diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h index 9c5194b31f7..1a1d7c1ae6b 100644 --- a/src/devices/machine/74148.h +++ b/src/devices/machine/74148.h @@ -40,8 +40,8 @@ *****************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_74148_H -#define MAME_DEVICES_MACHINE_74148_H +#ifndef MAME_MACHINE_74148_H +#define MAME_MACHINE_74148_H #pragma once diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h index 708eb63e7c0..13dd844096d 100644 --- a/src/devices/machine/74153.h +++ b/src/devices/machine/74153.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_74153_H -#define MAME_DEVICES_MACHINE_74153_H +#ifndef MAME_MACHINE_74153_H +#define MAME_MACHINE_74153_H #pragma once @@ -83,4 +83,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TTL153, ttl153_device) -#endif // MAME_DEVICES_MACHINE_74153_H +#endif // MAME_MACHINE_74153_H diff --git a/src/devices/machine/74165.h b/src/devices/machine/74165.h index e7d953fda9e..1f2580a899e 100644 --- a/src/devices/machine/74165.h +++ b/src/devices/machine/74165.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_74165_H -#define MAME_DEVICES_MACHINE_74165_H +#ifndef MAME_MACHINE_74165_H +#define MAME_MACHINE_74165_H #pragma once @@ -70,4 +70,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TTL165, ttl165_device) -#endif // MAME_DEVICES_MACHINE_74165_H +#endif // MAME_MACHINE_74165_H diff --git a/src/devices/machine/74166.h b/src/devices/machine/74166.h index 80095ce5458..9a22d69bd6a 100644 --- a/src/devices/machine/74166.h +++ b/src/devices/machine/74166.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_74166_H -#define MAME_DEVICES_MACHINE_74166_H +#ifndef MAME_MACHINE_74166_H +#define MAME_MACHINE_74166_H #pragma once @@ -69,4 +69,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TTL166, ttl166_device) -#endif // MAME_DEVICES_MACHINE_74166_H +#endif // MAME_MACHINE_74166_H diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h index e5d1a7a1fa0..42d6c74b862 100644 --- a/src/devices/machine/7474.h +++ b/src/devices/machine/7474.h @@ -39,8 +39,8 @@ *****************************************************************************/ -#ifndef MAME_MACHINE_TTL7474_H -#define MAME_MACHINE_TTL7474_H +#ifndef MAME_MACHINE_7474_H +#define MAME_MACHINE_7474_H #pragma once @@ -102,4 +102,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TTL7474, ttl7474_device) -#endif // MAME_MACHINE_TTL7474_H +#endif // MAME_MACHINE_7474_H diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index aeb529b697e..0d4f957399a 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -31,8 +31,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_ADC0808_H -#define MAME_DEVICES_MACHINE_ADC0808_H +#ifndef MAME_MACHINE_ADC0808_H +#define MAME_MACHINE_ADC0808_H #pragma once @@ -110,4 +110,4 @@ DECLARE_DEVICE_TYPE(ADC0808, adc0808_device) DECLARE_DEVICE_TYPE(ADC0809, adc0809_device) DECLARE_DEVICE_TYPE(M58990, m58990_device) -#endif // MAME_DEVICES_MACHINE_ADC0808_H +#endif // MAME_MACHINE_ADC0808_H diff --git a/src/devices/machine/adc0844.h b/src/devices/machine/adc0844.h index c4735da1b6c..7dc76c173d1 100644 --- a/src/devices/machine/adc0844.h +++ b/src/devices/machine/adc0844.h @@ -20,8 +20,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_ADC0844_H -#define MAME_DEVICES_MACHINE_ADC0844_H +#ifndef MAME_MACHINE_ADC0844_H +#define MAME_MACHINE_ADC0844_H #pragma once @@ -92,4 +92,4 @@ private: DECLARE_DEVICE_TYPE(ADC0844, adc0844_device) DECLARE_DEVICE_TYPE(ADC0848, adc0848_device) -#endif // MAME_DEVICES_MACHINE_ADC0844_H +#endif // MAME_MACHINE_ADC0844_H diff --git a/src/devices/machine/am2910.h b/src/devices/machine/am2910.h index bd0dff03f36..d4ddd435729 100644 --- a/src/devices/machine/am2910.h +++ b/src/devices/machine/am2910.h @@ -7,8 +7,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_AM2910_AM2910_H -#define MAME_MACHINE_AM2910_AM2910_H +#ifndef MAME_MACHINE_AM2910_H +#define MAME_MACHINE_AM2910_H #pragma once @@ -79,4 +79,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(AM2910, am2910_device) -#endif // MAME_MACHINE_AM2910_AM2910_H +#endif // MAME_MACHINE_AM2910_H diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index 68490ef0c6c..af8361892b6 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -29,8 +29,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_AM9517_H -#define MAME_MACHINE_AM9517_H +#ifndef MAME_MACHINE_AM9517A_H +#define MAME_MACHINE_AM9517A_H #pragma once @@ -244,4 +244,4 @@ DECLARE_DEVICE_TYPE(V5X_DMAU, v5x_dmau_device) DECLARE_DEVICE_TYPE(PCXPORT_DMAC, pcxport_dmac_device) DECLARE_DEVICE_TYPE(EISA_DMA, eisa_dma_device) -#endif // MAME_MACHINE_AM9517_H +#endif // MAME_MACHINE_AM9517A_H diff --git a/src/devices/machine/applepic.h b/src/devices/machine/applepic.h index 2ed67e4dbd0..b4c7629713c 100644 --- a/src/devices/machine/applepic.h +++ b/src/devices/machine/applepic.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_DEVICES_MACHINE_APPLEPIC_H -#define MAME_DEVICES_MACHINE_APPLEPIC_H +#ifndef MAME_MACHINE_APPLEPIC_H +#define MAME_MACHINE_APPLEPIC_H #pragma once @@ -107,4 +107,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(APPLEPIC, applepic_device) -#endif // MAME_DEVICES_MACHINE_APPLEPIC_H +#endif // MAME_MACHINE_APPLEPIC_H diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h index eb9220dfe70..e84899115c0 100644 --- a/src/devices/machine/bankdev.h +++ b/src/devices/machine/bankdev.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef MAME_DEVICES_MACHINE_BANKDEV_H -#define MAME_DEVICES_MACHINE_BANKDEV_H +#ifndef MAME_MACHINE_BANKDEV_H +#define MAME_MACHINE_BANKDEV_H #pragma once @@ -77,4 +77,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ADDRESS_MAP_BANK, address_map_bank_device) -#endif // MAME_DEVICES_MACHINE_BANKDEV_H +#endif // MAME_MACHINE_BANKDEV_H diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h index e527f5db238..bb96c3b9521 100644 --- a/src/devices/machine/bcreader.h +++ b/src/devices/machine/bcreader.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_MACHINE_BCREADER_H -#define MAME_DEVICES_MACHINE_BCREADER_H +#ifndef MAME_MACHINE_BCREADER_H +#define MAME_MACHINE_BCREADER_H #pragma once @@ -49,4 +49,4 @@ DECLARE_DEVICE_TYPE(BARCODE_READER, barcode_reader_device) // device type iterator typedef device_type_enumerator<barcode_reader_device> barcode_reader_device_enumerator; -#endif // MAME_DEVICES_MACHINE_BCREADER_H +#endif // MAME_MACHINE_BCREADER_H diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h index d1ce83327c1..d1f9684665f 100644 --- a/src/devices/machine/buffer.h +++ b/src/devices/machine/buffer.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef MAME_DEVICES_MACHINE_BUFFER_H -#define MAME_DEVICES_MACHINE_BUFFER_H +#ifndef MAME_MACHINE_BUFFER_H +#define MAME_MACHINE_BUFFER_H + +#pragma once class input_buffer_device : public device_t { @@ -27,4 +29,4 @@ protected: DECLARE_DEVICE_TYPE(INPUT_BUFFER, input_buffer_device) -#endif // MAME_DEVICES_MACHINE_BUFFER_H +#endif // MAME_MACHINE_BUFFER_H diff --git a/src/devices/machine/dp8573a.h b/src/devices/machine/dp8573a.h index a0fc749d1f2..87b2eb5c314 100644 --- a/src/devices/machine/dp8573a.h +++ b/src/devices/machine/dp8573a.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef DEVICES_MACHINE_DP8573_H -#define DEVICES_MACHINE_DP8573_H +#ifndef MAME_MACHINE_DP8573_H +#define MAME_MACHINE_DP8573_H #pragma once @@ -70,4 +70,4 @@ protected: DECLARE_DEVICE_TYPE(DP8572A, dp8572a_device) DECLARE_DEVICE_TYPE(DP8573A, dp8573a_device) -#endif // DEVICES_MACHINE_DP8573_H +#endif // MAME_MACHINE_DP8573_H diff --git a/src/devices/machine/gt913_snd.h b/src/devices/machine/gt913_snd.h index de5060a16e1..790eca81196 100644 --- a/src/devices/machine/gt913_snd.h +++ b/src/devices/machine/gt913_snd.h @@ -4,8 +4,8 @@ Casio GT913 sound (HLE) ***************************************************************************/ -#ifndef MAME_AUDIO_GT913_H -#define MAME_AUDIO_GT913_H +#ifndef MAME_MACHINE_GT913_SND_H +#define MAME_MACHINE_GT913_SND_H #pragma once @@ -85,4 +85,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(GT913_SOUND, gt913_sound_device) -#endif // MAME_AUDIO_GT913_H +#endif // MAME_MACHINE_GT913_SND_H diff --git a/src/devices/machine/i8087.h b/src/devices/machine/i8087.h index 9f8e17b613a..8a7fac194a0 100644 --- a/src/devices/machine/i8087.h +++ b/src/devices/machine/i8087.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett, Carl +#ifndef MAME_MACHINE_I8087_H +#define MAME_MACHINE_I8087_H + +#pragma once // SoftFloat 2 lacks an include guard #ifndef softfloat2_h @@ -223,3 +227,5 @@ private: void build_opcode_table(); }; + +#endif // MAME_MACHINE_I8087_H diff --git a/src/devices/machine/ldp1450hle.h b/src/devices/machine/ldp1450hle.h index 06ccd9b5415..22f71ce6a54 100644 --- a/src/devices/machine/ldp1450hle.h +++ b/src/devices/machine/ldp1450hle.h @@ -7,8 +7,8 @@ *************************************************************************/ -#ifndef MAME_MACHINE_LDP1450_H -#define MAME_MACHINE_LDP1450_H +#ifndef MAME_MACHINE_LDP1450HLE_H +#define MAME_MACHINE_LDP1450HLE_H #pragma once @@ -195,4 +195,4 @@ private: }; -#endif // MAME_MACHINE_LDP1450_H +#endif // MAME_MACHINE_LDP1450HLE_H diff --git a/src/devices/machine/ldv4200hle.h b/src/devices/machine/ldv4200hle.h index e7826a20ec9..8c40db7c04e 100644 --- a/src/devices/machine/ldv4200hle.h +++ b/src/devices/machine/ldv4200hle.h @@ -4,12 +4,12 @@ ldv4200hle.h - Pioneer LD-V4200 laserdisc player simulation. + Pioneer LD-V4200 LaserDisc player simulation. *************************************************************************/ -#ifndef MAME_MACHINE_LDV4200_H -#define MAME_MACHINE_LDV4200_H +#ifndef MAME_MACHINE_LDV4200HLE_H +#define MAME_MACHINE_LDV4200HLE_H #pragma once @@ -209,4 +209,4 @@ private: uint32_t m_curr_frame; }; -#endif // MAME_MACHINE_LDV4200_H +#endif // MAME_MACHINE_LDV4200HLE_H diff --git a/src/devices/machine/locomo.h b/src/devices/machine/locomo.h index 52f7ad69355..ae26826d88d 100644 --- a/src/devices/machine/locomo.h +++ b/src/devices/machine/locomo.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_LOCOMO -#define MAME_MACHINE_LOCOMO +#ifndef MAME_MACHINE_LOCOMO_H +#define MAME_MACHINE_LOCOMO_H #pragma once @@ -31,4 +31,4 @@ protected: DECLARE_DEVICE_TYPE(LOCOMO, locomo_device) -#endif // MAME_MACHINE_LOCOMO +#endif // MAME_MACHINE_LOCOMO_H diff --git a/src/devices/machine/mediagx_cs5530_video.h b/src/devices/machine/mediagx_cs5530_video.h index 3efaf975a4c..4d0ce803b9c 100644 --- a/src/devices/machine/mediagx_cs5530_video.h +++ b/src/devices/machine/mediagx_cs5530_video.h @@ -1,8 +1,8 @@ // license: BSD-3-Clause // copyright-holders: Angelo Salese -#ifndef MAME_MACHINE_SIS630_VGA_H -#define MAME_MACHINE_SIS630_VGA_H +#ifndef MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H +#define MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H #pragma once @@ -26,4 +26,4 @@ protected: DECLARE_DEVICE_TYPE(MEDIAGX_CS5530_VIDEO, mediagx_cs5530_video_device) -#endif +#endif // MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H diff --git a/src/devices/machine/mv_sonora.h b/src/devices/machine/mv_sonora.h index 1b9c2945a80..96c3c89eeed 100644 --- a/src/devices/machine/mv_sonora.h +++ b/src/devices/machine/mv_sonora.h @@ -6,8 +6,8 @@ Supports 5 different modelines at up to 16bpp *********************************************************************/ -#ifndef MAME_MACHINE_MAC_VIDEO_SONORA_H -#define MAME_MACHINE_MAC_VIDEO_SONORA_H +#ifndef MAME_MACHINE_MV_SONORA_H +#define MAME_MACHINE_MV_SONORA_H #pragma once @@ -73,4 +73,4 @@ private: DECLARE_DEVICE_TYPE(MAC_VIDEO_SONORA, mac_video_sonora_device) -#endif /* MAME_MACHINE_MAC_VIDEO_SONORA_H */ +#endif // MAME_MACHINE_MV_SONORA_H diff --git a/src/devices/machine/pc97338.h b/src/devices/machine/pc97338.h index e7d5a45387d..f40ddf8d5a3 100644 --- a/src/devices/machine/pc97338.h +++ b/src/devices/machine/pc97338.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders: Angelo Salese -#ifndef MAME_MACHINE_PC97336_H -#define MAME_MACHINE_PC97336_H +#ifndef MAME_MACHINE_PC97338_H +#define MAME_MACHINE_PC97338_H #pragma once @@ -121,4 +121,4 @@ private: DECLARE_DEVICE_TYPE(PC97338, pc97338_device); -#endif // MAME_MACHINE_PC97336_H +#endif // MAME_MACHINE_PC97338_H diff --git a/src/devices/machine/pxa255.h b/src/devices/machine/pxa255.h index e12c6d8683f..9acd9dac987 100644 --- a/src/devices/machine/pxa255.h +++ b/src/devices/machine/pxa255.h @@ -9,8 +9,8 @@ * **************************************************************************/ -#ifndef MAME_MACHINE_PXA255 -#define MAME_MACHINE_PXA255 +#ifndef MAME_MACHINE_PXA255_H +#define MAME_MACHINE_PXA255_H #pragma once @@ -478,4 +478,4 @@ protected: DECLARE_DEVICE_TYPE(PXA255_PERIPHERALS, pxa255_periphs_device) -#endif // MAME_MACHINE_PXA255 +#endif // MAME_MACHINE_PXA255_H diff --git a/src/devices/machine/sa1110.h b/src/devices/machine/sa1110.h index 892107878f3..42c8131e442 100644 --- a/src/devices/machine/sa1110.h +++ b/src/devices/machine/sa1110.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_SA1110 -#define MAME_MACHINE_SA1110 +#ifndef MAME_MACHINE_SA1110_H +#define MAME_MACHINE_SA1110_H #pragma once @@ -905,4 +905,4 @@ protected: DECLARE_DEVICE_TYPE(SA1110_PERIPHERALS, sa1110_periphs_device) -#endif // MAME_MACHINE_SA1110 +#endif // MAME_MACHINE_SA1110_H diff --git a/src/devices/machine/sa1111.h b/src/devices/machine/sa1111.h index 9c09d47ec4e..b44562e499c 100644 --- a/src/devices/machine/sa1111.h +++ b/src/devices/machine/sa1111.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_SA1111 -#define MAME_MACHINE_SA1111 +#ifndef MAME_MACHINE_SA1111_H +#define MAME_MACHINE_SA1111_H #pragma once @@ -685,4 +685,4 @@ protected: DECLARE_DEVICE_TYPE(SA1111, sa1111_device) -#endif // MAME_MACHINE_SA1111 +#endif // MAME_MACHINE_SA1111_H diff --git a/src/devices/machine/scc66470.h b/src/devices/machine/scc66470.h index f5eeaf63215..c66bee84850 100644 --- a/src/devices/machine/scc66470.h +++ b/src/devices/machine/scc66470.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_SCC66470_H -#define MAME_VIDEO_SCC66470_H +#ifndef MAME_MACHINE_SCC66470_H +#define MAME_MACHINE_SCC66470_H #pragma once @@ -112,4 +112,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(SCC66470, scc66470_device) -#endif // MAME_VIDEO_SCC66470_H +#endif // MAME_MACHINE_SCC66470_H diff --git a/src/devices/machine/sci4.h b/src/devices/machine/sci4.h index 21452de5aee..bbffd9a239a 100644 --- a/src/devices/machine/sci4.h +++ b/src/devices/machine/sci4.h @@ -3,8 +3,8 @@ // Yamaha SCI4 / XV833A00, 7-lines serial chip with 4 multiplexed on one and the other 3 separated -#ifndef DEVICES_MACHINE_SCI4_H -#define DEVICES_MACHINE_SCI4_H +#ifndef MAME_MACHINE_SCI4_H +#define MAME_MACHINE_SCI4_H #pragma once @@ -71,4 +71,4 @@ protected: DECLARE_DEVICE_TYPE(SCI4, sci4_device) -#endif +#endif // MAME_MACHINE_SCI4_H diff --git a/src/devices/machine/scoop.h b/src/devices/machine/scoop.h index 818b31a702b..40bdf966060 100644 --- a/src/devices/machine/scoop.h +++ b/src/devices/machine/scoop.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_SCOOP -#define MAME_MACHINE_SCOOP +#ifndef MAME_MACHINE_SCOOP_H +#define MAME_MACHINE_SCOOP_H #pragma once @@ -39,4 +39,4 @@ protected: DECLARE_DEVICE_TYPE(SCOOP, scoop_device) -#endif // MAME_MACHINE_SCOOP +#endif // MAME_MACHINE_SCOOP_H diff --git a/src/devices/machine/segacrpt_device.h b/src/devices/machine/segacrpt_device.h index 559bee34655..59d1d62599b 100644 --- a/src/devices/machine/segacrpt_device.h +++ b/src/devices/machine/segacrpt_device.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_SEGACRYPT_DEVICE_H -#define MAME_MACHINE_SEGACRYPT_DEVICE_H +#ifndef MAME_MACHINE_SEGACRPT_DEVICE_H +#define MAME_MACHINE_SEGACRPT_DEVICE_H #pragma once @@ -290,5 +290,4 @@ DECLARE_DEVICE_TYPE(SEGA_315_5128, sega_315_5128_device) DECLARE_DEVICE_TYPE(SEGA_315_5028, sega_315_5028_device) DECLARE_DEVICE_TYPE(SEGA_315_5084, sega_315_5084_device) - -#endif // MAME_MACHINE_SEGACRYPT_DEVICE_H +#endif // MAME_MACHINE_SEGACRPT_DEVICE_H diff --git a/src/devices/machine/sis630_gui.h b/src/devices/machine/sis630_gui.h index 36cc02686cb..150ed584f93 100644 --- a/src/devices/machine/sis630_gui.h +++ b/src/devices/machine/sis630_gui.h @@ -1,8 +1,8 @@ // license: BSD-3-Clause // copyright-holders: Angelo Salese -#ifndef MAME_MACHINE_SIS630_VGA_H -#define MAME_MACHINE_SIS630_VGA_H +#ifndef MAME_MACHINE_SIS630_GUI_H +#define MAME_MACHINE_SIS630_GUI_H #pragma once @@ -94,5 +94,4 @@ private: DECLARE_DEVICE_TYPE(SIS630_BRIDGE, sis630_bridge_device) - -#endif +#endif // MAME_MACHINE_SIS630_GUI_H diff --git a/src/devices/machine/sis85c496.h b/src/devices/machine/sis85c496.h index c6e914ddb46..679cc26e31c 100644 --- a/src/devices/machine/sis85c496.h +++ b/src/devices/machine/sis85c496.h @@ -2,8 +2,8 @@ // copyright-holders:R. Belmont // SiS 85c496 northbridge (PCI & CPU Memory Controller) -#ifndef SIS85C496_H -#define SIS85C496_H +#ifndef MAME_MACHINE_SIS85C496_H +#define MAME_MACHINE_SIS85C496_H #include "pci.h" #include "machine/ds128x.h" @@ -193,4 +193,4 @@ private: DECLARE_DEVICE_TYPE(SIS85C496_HOST, sis85c496_host_device) -#endif +#endif // MAME_MACHINE_SIS85C496_H diff --git a/src/devices/machine/smartmed.h b/src/devices/machine/smartmed.h index 0799f8c1063..cf029b7c3a7 100644 --- a/src/devices/machine/smartmed.h +++ b/src/devices/machine/smartmed.h @@ -4,8 +4,8 @@ smartmed.h: header file for smartmed.c */ -#ifndef MAME_MACHINE_SMARTMEDIA_H -#define MAME_MACHINE_SMARTMEDIA_H +#ifndef MAME_MACHINE_SMARTMED_H +#define MAME_MACHINE_SMARTMED_H #pragma once @@ -54,4 +54,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(SMARTMEDIA, smartmedia_image_device) -#endif // MAME_MACHINE_SMARTMEDIA_H +#endif // MAME_MACHINE_SMARTMED_H diff --git a/src/devices/machine/smpc.h b/src/devices/machine/smpc.h index 873998b71aa..dfe8d541be5 100644 --- a/src/devices/machine/smpc.h +++ b/src/devices/machine/smpc.h @@ -6,8 +6,8 @@ //void saturn_SMPC_w(offs_t offset, uint8_t data); //uint8_t saturn_SMPC_r(offs_t offset); -#ifndef MAME_MACHINE_SMPC_HLE_H -#define MAME_MACHINE_SMPC_HLE_H +#ifndef MAME_MACHINE_SMPC_H +#define MAME_MACHINE_SMPC_H #pragma once @@ -199,12 +199,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(SMPC_HLE, smpc_hle_device) - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - - -#endif // MAME_MACHINE_SMPC_HLE_H - +#endif // MAME_MACHINE_SMPC_H diff --git a/src/devices/machine/sun4c_mmu.h b/src/devices/machine/sun4c_mmu.h index 2a3da5b6d6f..423d866ec80 100644 --- a/src/devices/machine/sun4c_mmu.h +++ b/src/devices/machine/sun4c_mmu.h @@ -6,10 +6,10 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_MACHINE_SUN4C_MMU_H +#define MAME_MACHINE_SUN4C_MMU_H -#ifndef DEVICE_MACHINE_SUN4C_MMU_H -#define DEVICE_MACHINE_SUN4C_MMU_H +#pragma once #include "cpu/sparc/sparc_intf.h" #include "machine/ram.h" @@ -211,4 +211,4 @@ public: DECLARE_DEVICE_TYPE(SUN4_MMU, sun4_mmu_device) DECLARE_DEVICE_TYPE(SUN4C_MMU, sun4c_mmu_device) -#endif // DEVICE_MACHINE_SUN4C_MMU_H +#endif // MAME_MACHINE_SUN4C_MMU_H diff --git a/src/devices/machine/tdc1008.h b/src/devices/machine/tdc1008.h index d35ec428487..1df2a66ed5a 100644 --- a/src/devices/machine/tdc1008.h +++ b/src/devices/machine/tdc1008.h @@ -7,8 +7,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_TDC1008_TDC1008_H -#define MAME_MACHINE_TDC1008_TDC1008_H +#ifndef MAME_MACHINE_TDC1008_H +#define MAME_MACHINE_TDC1008_H #pragma once @@ -108,4 +108,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(TDC1008, tdc1008_device) -#endif // MAME_MACHINE_TDC1008_TDC1008_H +#endif // MAME_MACHINE_TDC1008_H diff --git a/src/devices/machine/timehelp.h b/src/devices/machine/timehelp.h index 8716c63c450..555c8cb83f9 100644 --- a/src/devices/machine/timehelp.h +++ b/src/devices/machine/timehelp.h @@ -8,10 +8,10 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_MACHINE_TIMEHELP_H +#define MAME_MACHINE_TIMEHELP_H -#ifndef SRC_DEVICES_MACHINE_TIMEHELP_H -#define SRC_DEVICES_MACHINE_TIMEHELP_H +#pragma once class time_helper { @@ -55,4 +55,4 @@ public: }; -#endif // SRC_DEVICES_MACHINE_TIMEHELP_H +#endif // MAME_MACHINE_TIMEHELP_H diff --git a/src/devices/machine/tmc208k.h b/src/devices/machine/tmc208k.h index bbb770d13ee..e2c51eaa034 100644 --- a/src/devices/machine/tmc208k.h +++ b/src/devices/machine/tmc208k.h @@ -10,8 +10,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_TMC208K_TMC208K_H -#define MAME_MACHINE_TMC208K_TMC208K_H +#ifndef MAME_MACHINE_TMC208K_H +#define MAME_MACHINE_TMC208K_H #pragma once @@ -99,4 +99,4 @@ protected: DECLARE_DEVICE_TYPE(TMC208K, tmc208k_device) DECLARE_DEVICE_TYPE(TMC28KU, tmc28ku_device) -#endif // MAME_MACHINE_TMC208K_TMC208K_H +#endif // MAME_MACHINE_TMC208K_H diff --git a/src/devices/machine/ucb1200.h b/src/devices/machine/ucb1200.h index e07519274bc..fe1f2009c3e 100644 --- a/src/devices/machine/ucb1200.h +++ b/src/devices/machine/ucb1200.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_UCB1200 -#define MAME_MACHINE_UCB1200 +#ifndef MAME_MACHINE_UCB1200_H +#define MAME_MACHINE_UCB1200_H #pragma once @@ -144,4 +144,4 @@ protected: DECLARE_DEVICE_TYPE(UCB1200, ucb1200_device) -#endif // MAME_MACHINE_UCB1200 +#endif // MAME_MACHINE_UCB1200_H diff --git a/src/devices/machine/upd7004.h b/src/devices/machine/upd7004.h index 12e607720c2..2864177ee96 100644 --- a/src/devices/machine/upd7004.h +++ b/src/devices/machine/upd7004.h @@ -24,8 +24,8 @@ ***************************************************************************/ -#ifndef MAME_DEVICES_MACHINE_UPD7004_H -#define MAME_DEVICES_MACHINE_UPD7004_H +#ifndef MAME_MACHINE_UPD7004_H +#define MAME_MACHINE_UPD7004_H #pragma once @@ -78,4 +78,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(UPD7004, upd7004_device) -#endif // MAME_DEVICES_MACHINE_UPD7004_H +#endif // MAME_MACHINE_UPD7004_H diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index ad5324019ee..5465ea7c10d 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_DEVICES_MACHINE_UPD765_H -#define MAME_DEVICES_MACHINE_UPD765_H +#ifndef MAME_MACHINE_UPD765_H +#define MAME_MACHINE_UPD765_H #pragma once @@ -635,4 +635,4 @@ DECLARE_DEVICE_TYPE(MCS3201, mcs3201_device) DECLARE_DEVICE_TYPE(TC8566AF, tc8566af_device) DECLARE_DEVICE_TYPE(HD63266F, hd63266f_device) -#endif // MAME_DEVICES_MACHINE_UPD765_H +#endif // MAME_MACHINE_UPD765_H |
