From 8f180fdecdf3107b28b0c926b741461fc6a58c3e Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 1 Jan 2018 03:15:06 +0100
Subject: [PATCH] Fixed all the compile-breaking mistakes.

---
 src/cpu/x86_ops_amd.h  |  4 +---
 src/cpu/x86_ops_i686.h | 11 +----------
 src/keyboard_at.c      | 12 ++++++++----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/cpu/x86_ops_amd.h b/src/cpu/x86_ops_amd.h
index 2151c6f3e..0b8a1e094 100644
--- a/src/cpu/x86_ops_amd.h
+++ b/src/cpu/x86_ops_amd.h
@@ -8,20 +8,18 @@
  *
  *		AMD SYSCALL and SYSRET CPU Instructions.
  *
- * Version:	@(#)x86_ops_amd.h	1.0.0	2018/01/01
+ * Version:	@(#)x86_ops_amd.h	1.0.1	2018/01/01
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016-2018 Miran Grca.
  */
 
-#ifndef internal_illegal
 static int internal_illegal(char *s)
 {
 	cpu_state.pc = cpu_state.oldpc;
 	x86gpf(s, 0);
 	return cpu_state.abrt;
 }
-#endif
 
 /*	0 = Limit 0-15
 	1 = Base 0-15
diff --git a/src/cpu/x86_ops_i686.h b/src/cpu/x86_ops_i686.h
index f44a1509b..1ef3693b9 100644
--- a/src/cpu/x86_ops_i686.h
+++ b/src/cpu/x86_ops_i686.h
@@ -8,21 +8,12 @@
  *
  *		x86 i686 (Pentium Pro/Pentium II) CPU Instructions.
  *
- * Version:	@(#)x86_ops_i686.h	1.0.1	2018/01/01
+ * Version:	@(#)x86_ops_i686.h	1.0.2	2018/01/01
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016-2018 Miran Grca.
  */
 
-#ifndef internal_illegal
-static int internal_illegal(char *s)
-{
-	cpu_state.pc = cpu_state.oldpc;
-	x86gpf(s, 0);
-	return cpu_state.abrt;
-}
-#endif
-
 /*	0 = Limit 0-15
 	1 = Base 0-15
 	2 = Base 16-23 (bits 0-7), Access rights
diff --git a/src/keyboard_at.c b/src/keyboard_at.c
index 17c7cdc31..ef55fa070 100644
--- a/src/keyboard_at.c
+++ b/src/keyboard_at.c
@@ -8,15 +8,15 @@
  *
  *		Intel 8042 (AT keyboard controller) emulation.
  *
- * Version:	@(#)keyboard_at.c	1.0.12	2017/12/31
+ * Version:	@(#)keyboard_at.c	1.0.13	2018/01/01
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *		Copyright 2008-2017 Sarah Walker.
- *		Copyright 2016,2017 Miran Grca.
- *		Copyright 2017 Fred N. van Kempen.
+ *		Copyright 2008-2018 Sarah Walker.
+ *		Copyright 2016,2018 Miran Grca.
+ *		Copyright 2018 Fred N. van Kempen.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -1011,9 +1011,13 @@ bad_command:
 					case ROM_MRTHOR:
 					case ROM_AP53:
 					case ROM_P55T2S:
+#ifdef DEV_BRANCH
+#ifdef USE_I686
 					case ROM_S1668:
+#endif
 #ifdef GREENB
 					case ROM_4GPV31:
+#endif
 #endif
 						/*Set extended controller RAM*/
 						kbdlog("ATkbd: set extended controller RAM\n");