get #include guards in line with filenames, avoid expensive things in…

… static initialisation (nw)
mamedev · Feb 27, 2020 · 60ab9de · 60ab9de
1 parent cbf834f
commit 60ab9de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/devices/cpu/ks0164/ks0164d.h b/src/devices/cpu/ks0164/ks0164d.h
@@ -3,8 +3,8 @@
 
 // KS0164 disassembler
 
-#ifndef MAME_CPU_KS0164_KS0164DASM_H
-#define MAME_CPU_KS0164_KS0164DASM_H
+#ifndef MAME_CPU_KS0164_KS0164D_H
+#define MAME_CPU_KS0164_KS0164D_H
 
 #pragma once
 
@@ -21,7 +21,7 @@ class ks0164_disassembler : public util::disasm_interface
 	struct instruction {
 		u16 value;
 		u16 mask;
-		std::function<u32 (std::ostream &, u32, const data_buffer &, u32)> cb;
+		u32 (*cb)(std::ostream &, u32, const data_buffer &, u32);
 	};
 
 	static const instruction instructions[];
@@ -31,5 +31,4 @@ class ks0164_disassembler : public util::disasm_interface
 	static std::string off16(s16 dt);
 };
 
-#endif
-
+#endif // MAME_CPU_KS0164_KS0164D_H
diff --git a/src/devices/cpu/xavix2/xavix2d.h b/src/devices/cpu/xavix2/xavix2d.h
@@ -3,8 +3,8 @@
 
 // Xavix2 disassembler
 
-#ifndef MAME_CPU_XAVIX2_XAVIX2DASM_H
-#define MAME_CPU_XAVIX2_XAVIX2DASM_H
+#ifndef MAME_CPU_XAVIX2_XAVIX2D_H
+#define MAME_CPU_XAVIX2_XAVIX2D_H
 
 #pragma once
 
@@ -50,5 +50,4 @@ class xavix2_disassembler : public util::disasm_interface
 	std::string rel8();
 };
 
-#endif
-
+#endif // MAME_CPU_XAVIX2_XAVIX2D_H